Merge remote-tracking branch 'origin/master' into walldriving

.gitignore

@@ -1,12 +1,15 @@
 bld*/
 build*/
 cmake_build/
+cmake_build*/
 dependencies/
 CMakeFiles/
 stk-editor/
 
 .config/
 supertuxkart-64
+make*.bat
+__pycache__
 
 data/editor
 data/karts
@@ -16,6 +19,7 @@ data/music
 data/sfx
 data/textures
 data/tracks
+data/wip-tracks
 data/.svn
 
 # Ignore doxygen output
@@ -39,7 +43,12 @@ src/html
 *.vcxproj.filters
 *.vcxproj.user
 *~
+*.swp
+
+# Ignore QtCreator project file
+CMakeLists.txt.user
 
 packets_log.txt
 history.dat
 README.dependencies
+xx

.travis.yml

@@ -3,42 +3,51 @@
 # Configuration manual:
 # http://docs.travis-ci.com/user/build-configuration/
 #
+sudo: false
 language: cpp
 compiler:
   - gcc
-# - clang
-#branches:
-#  only:
-#    - master
-before_install:
-  # Update repos
-  - sudo apt-get update -qq
-  # Install dependencies
-  - sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
-  # Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
-  # so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
-  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
-  - sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
-  - sudo apt-get update -qq
-  - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev
-script:
-  # First a debug build: 
-  - mkdir build-debug
-  - cd build-debug
-  - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
-  - make VERBOSE=1 -j 4 
+  - clang
 
-  # Then a release build: 
-  - cd ..
-  - mkdir build-release
-  - cd build-release
-  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
-  - make VERBOSE=1 -j 4 
+matrix:
+  fast_finish: true
+
+env:
+  matrix:
+    - BUILD_TYPE="Debug"
+    - BUILD_TYPE="Release"
+
+addons:
+  apt:
+    packages:
+    - build-essential
+    - libogg-dev
+    - libvorbis-dev
+    - libopenal-dev
+    - libxxf86vm-dev
+    - libcurl4-openssl-dev
+    - libfribidi-dev
+    - libbluetooth-dev
+    - libgl1-mesa-dev
+    - libglu1-mesa-dev
+    - libglew-dev
+    - cmake
+
+before_script:
+  - export THREADS=$((`nproc` + 1))
+  - echo "THREADS = $THREADS"
+  - free -mt
+
+script:
+  - mkdir "build"
+  - cd "build"
+  - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCHECK_ASSETS=off
+  - make VERBOSE=1 -j $THREADS
 
 notifications:
   irc:
     channels:
-      - "irc.freenode.org#stk"
+      - "irc.freenode.org#supertuxkart"
     skip_join: false
     use_notice: true
     template:

CHANGELOG.md

@@ -1,4 +1,31 @@
-##SuperTuxKart 0.8.1
+## SupertTuxKart 0.9.1
+* Many bug fixes
+* Started to use scripting in tracks
+* Significant audio performance improvements
+* Smaller tweaks and improvements to several tracks including 
+** Math class
+** XR591
+** Fort Magma
+** Gran Paradiso
+** Subsea
+* Tweak to challenges
+* Better support for driving tracks in reverse
+
+## SupertTuxKart 0.9 (April 2015)
+* Fully shader-based rendering engine
+* New tracks Cocoa Temple and Gran Paradiso
+* 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
+* Grand Prix editor, including creation of random GPs 
+* Different kart physics
+
+
+## SuperTuxKart 0.8.1 (26. November 2013)
 * New track STK Enterprise
 * Updated track The old mines
 * Updated Lighthouse track
@@ -10,7 +37,7 @@
 * Added Tutorial
 * Added new Supertux difficulty
 * New bubblegum shield weapon
-* New Speeodmeter and nitro meter
+* New Speedometer and nitro meter
 * Add ability to filter addons
 * Updated nitro models
 * Add ability to save and resume Grand Prix
@@ -18,8 +45,7 @@
 * Wiimote support
 
 
-
-##SuperTuxKart 0.8
+## SuperTuxKart 0.8 (11. December 2012)
 * Story mode and new challenge set
 * Improved AI
 * Skidding and better collision physics
@@ -34,7 +60,7 @@
 * New music
 
 
-##SuperTuxKart 0.7.3
+## SuperTuxKart 0.7.3 (2. November 2011)
 * New Zen Garden and Subsea tracks
 * New Island battle arena
 * New Suzanne kart
@@ -50,7 +76,7 @@
 * Better placement of rescued karts
 * Transition track-making to blender 2.5/2.6
 
-##SuperTuxKart 0.7.2
+## SuperTuxKart 0.7.2 (15. July 2011)
 * Added in-game addon manager
 * Fixed major memory leaks
 * New Snow Peak track by Samuncle
@@ -60,11 +86,11 @@
 * Improve gamepad configuration under Windows (add ability to tell gamepads apart)
 * Various other tweaks done and glitches fixed
 
-##SuperTuxKart 0.7.1b
+## SuperTuxKart 0.7.1b (21. April 2011)
 * Fix circular dependency in challenges
 * Updated translations
 
-##SuperTuxKart 0.7.1
+## 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
@@ -83,7 +109,7 @@
 * Full RTL (right to left) support
 * Various other tweaks done and glitches fixed
 
-##SuperTuxKart 0.7 (December 2010)
+## SuperTuxKart 0.7 (December 2010)
 Too many to list them all. Main points:
 
 * Irrlicht:
@@ -97,11 +123,11 @@ Too many to list them all. Main points:
 * New art:
   - New tracks farm, hacienda, scotland, secret garden
 
-##SuperTuxKart 0.6.2a (October 2009)
+## SuperTuxKart 0.6.2a (October 2009)
 * Bugfix: STK would crash while trying to save the config file
           on Windows Vista.
 
-##SuperTuxKart 0.6.2 (July 2009)
+## SuperTuxKart 0.6.2 (July 2009)
 * Bugfix: Game could crash in rare circumstances.
 * Bugfix: Restarting a GP (with the in-race menu ESC) would not subtract already allocated points.
 * Bugfix: A race could be finished with an invalid shortcut.
@@ -111,10 +137,10 @@ Too many to list them all. Main points:
 * Bugfix: GP result showed kart identifier instead of name.
 * Improvement: there is now 1 1 sec. wait period for the race result screen, avoiding the problem that someone presses space/enter at the end of a race, immediately quitting the menu before it can be read.
 
-##SuperTuxKart 0.6.1a (February 2009)
+## SuperTuxKart 0.6.1a (February 2009)
 * Bugfix: battle mode would not display track groups.
 
-##SuperTuxKart 0.6.1 (February 2009)
+## SuperTuxKart 0.6.1 (February 2009)
 * Added new kart ("Puffy"), new battle map ("Cave"), and 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.
@@ -124,7 +150,7 @@ Too many to list them all. Main points:
 * Added slow-down for karts driving backwards.
 * Somewhat reduced 'shaking' of AI driven karts.
 
-##SuperTuxKart 0.6 (January 2009)
+## 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
@@ -147,7 +173,7 @@ Too many to list them all. Main points:
   - Fixed 'joystick locks' (kart would turn even if the joystick is in neutral),
     thanks to Samjam for the patch.
 
-##SuperTuxKart 0.5 (May 2008)
+## 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
@@ -161,7 +187,7 @@ Too many to list them all. Main points:
 	- an AI crash fix (Chris Morris)
 
 
-##SuperTuxKart 0.4 (February 2008)
+## SuperTuxKart 0.4 (February 2008)
 * New physics handling using the bullet physics engine
 * New kart: wilber
 * Improved 'Shifting Sands' and 'Lighthouse' tracks
@@ -172,7 +198,7 @@ Too many to list them all. Main points:
 * Additional music and main theme
 	
 	
-##SuperTuxKart 0.3 (May 2007)
+## SuperTuxKart 0.3 (May 2007)
 * Highscore lists	
 * Shortcut detection 	
 * Improved AI

CMakeLists.txt

@@ -1,8 +1,12 @@
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.8.1")
+set(PROJECT_VERSION "0.9.1")
+
+cmake_minimum_required(VERSION 2.8.4)
+if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
+  cmake_policy(SET CMP0043 OLD)
+endif()
 
-cmake_minimum_required(VERSION 2.8.1)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
 include(BuildTypeSTKRelease)
@@ -11,16 +15,14 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "STKRelease")
 endif()
 
-option(USE_WIIUSE "Support for wiimote input devices" ON)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
+option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
+option(ENABLE_NETWORK_MULTIPLAYER "Enable network multiplayer. This will replace the online profile GUI in the main menu with the network multiplayer GUI" OFF)
 
-if(UNIX)
-    option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF)
-endif()
-if(MSVC)
+if(MSVC AND (MSVC_VERSION LESS 1900))
     # Normally hide the option to build wiiuse on VS, since it depends
-    # on the installation of the Windows DDK (Driver Developer Kit), 
+    # on the installation of the Windows DDK (Driver Developer Kit),
     # which also needs an absolute path :(
     option(WIIUSE_BUILD "Build wiiuse lib (only for developers)" OFF)
     mark_as_advanced(WIIUSE_BUILD)
@@ -28,8 +30,15 @@ else()
     set(WIIUSE_BUILD ON)
 endif()
 
+if(MINGW OR CYGWIN)
+    option(USE_WIIUSE "Support for wiimote input devices" OFF)
+else()
+    option(USE_WIIUSE "Support for wiimote input devices" ON)
+endif()
+
 if(UNIX AND NOT APPLE)
     option(USE_XRANDR "Use xrandr instead of vidmode" ON)
+    option(USE_ASAN   "Build with Leak/Address sanitizer" OFF)
 endif()
 
 set(STK_SOURCE_DIR "src")
@@ -42,6 +51,14 @@ 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")
 
+# These variables enable MSVC to find libraries located in "dependencies"
+if(WIN32)
+    set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/dependencies/include")
+    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
+    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
+    add_definitions(-D_IRR_STATIC_LIB_)
+endif()
+
 # Build the Bullet physics library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
@@ -50,6 +67,37 @@ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
 
+# Build glew library
+add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+
+if((WIN32 AND NOT MINGW) OR APPLE)
+    if (NOT APPLE)
+    # 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)
+    set (PNG_TESTS FALSE)
+    set (PNG_SHARED FALSE)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
+
+    #build jpeg library
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+
+    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+    set(PNG_LIBRARY png15_static)
+    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+    set(JPEG_LIBRARY jpeglib)
+endif()
 # Build the irrlicht library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
 include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
@@ -65,25 +113,33 @@ if(USE_WIIUSE)
     include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse")
 endif()
 
-
 # Set include paths
 include_directories(${STK_SOURCE_DIR})
 
-# These variables enable MSVC to find libraries located in "dependencies"
-if(MSVC)
-    set(ENV{PATH} ${PROJECT_SOURCE_DIR}/dependencies/include)
-    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
-    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
-    add_definitions(/D_IRR_STATIC_LIB_)
-endif()
-
 if(APPLE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
 elseif(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")   # Enable multi-processor compilation (faster)
 endif()
 
+
+# Build the angelscript library if not in system
+if(USE_SYSTEM_ANGELSCRIPT)
+    find_package(Angelscript)
+    if(ANGELSCRIPT_FOUND)
+        include_directories(${Angelscript_INCLUDE_DIRS})
+    else()
+        message(FATAL_ERROR "Angelscript not found. "
+            "Either install angelscript or use built-in version using "
+            "-DUSE_SYSTEM_ANGELSCRIPT=0")
+    endif()
+else()
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
+    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
@@ -109,6 +165,15 @@ else()
     include_directories(${OGGVORBIS_INCLUDE_DIRS})
 endif()
 
+# Freetype
+find_package(Freetype)
+if(FREETYPE_FOUND)
+    include_directories(${FREETYPE_INCLUDE_DIRS})
+else()
+    message(FATAL_ERROR "Freetype not found. "
+        "Freetype is required to display characters in SuperTuxKart. ")
+endif()
+
 # Fribidi
 if(USE_FRIBIDI)
     find_package(Fribidi)
@@ -121,11 +186,11 @@ if(USE_FRIBIDI)
     endif()
 endif()
 
-
-if(UNIX)
-#    if(USE_CPP2011)
-        add_definitions("-std=gnu++0x")
-#    endif()
+# OpenMP
+find_package(OpenMP)
+if (OPENMP_FOUND)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()
 
 # OpenGL
@@ -133,18 +198,33 @@ find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIR})
 
 if(UNIX AND NOT APPLE)
+    find_package(X11 REQUIRED)
+    include_directories(${X11_INCLUDE_DIR})
+
     if(USE_XRANDR)
         find_package(Xrandr REQUIRED)
+        if(NOT XRANDR_FOUND)
+            message(FATAL_ERROR "XRANDR not found.")
+        endif()
     else()
         find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
         mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
     endif()
 endif()
 
-    
 # Set some compiler options
-if(UNIX)
-    add_definitions(-Wall)
+if(UNIX OR MINGW)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
+endif()
+
+if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
+endif()
+
+# Netwowk Multiplayer
+if(ENABLE_NETWORK_MULTIPLAYER)
+  add_definitions(-DENABLE_NETWORK_MULTIPLAYER_SCREEN)
 endif()
 
 if(WIN32)
@@ -153,6 +233,14 @@ if(WIN32)
 
     # And shut up about unsafe stuff
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+
+    # Avoid timespec structure redeclaration on Visual Studio 2015
+    if (NOT (MSVC_VERSION LESS 1900))
+        add_definitions(-DHAVE_STRUCT_TIMESPEC)
+    endif()
+endif()
+
+if(MSVC)
     # VS will automatically add NDEBUG for release mode, but only _DEBUG in debug mode.
     # Since STK uses DEBUG, this is added for debug compilation only:
     set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG)
@@ -169,6 +257,9 @@ endif()
 # TODO: remove this switch
 add_definitions(-DHAVE_OGGVORBIS)
 
+if(WIN32)
+    configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
+endif()
 
 # Provides list of source and header files (STK_SOURCES and STK_HEADERS)
 include(sources.cmake)
@@ -212,19 +303,28 @@ if(APPLE)
             COMMAND ln -f -s ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources)
     endif()
 else()
-    find_library(PTHREAD_LIBRARY NAMES pthread pthreadVC2 PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib)
+    if(MSVC)
+        set(PTHREAD_NAMES pthreadVC2)
+    elseif(MINGW)
+        set(PTHREAD_NAMES "winpthread-1" "libwinpthread-1" "pthreadGC2")
+    endif()
+    find_library(PTHREAD_LIBRARY NAMES pthread ${PTHREAD_NAMES} PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib)
     mark_as_advanced(PTHREAD_LIBRARY)
 
     # Set data dir (absolute or relative to CMAKE_INSTALL_PREFIX)
-    get_filename_component(STK_INSTALL_DATA_DIR_ABSOLUTE ${STK_INSTALL_DATA_DIR} ABSOLUTE)
-    if(${STK_INSTALL_DATA_DIR_ABSOLUTE} STREQUAL ${STK_INSTALL_DATA_DIR})
-        add_definitions(-DSUPERTUXKART_DATADIR=\"${STK_INSTALL_DATA_DIR_ABSOLUTE}\")
+    if(NOT STK_INSTALL_DATA_DIR_ABSOLUTE)
+        get_filename_component(STK_INSTALL_DATA_DIR_ABSOLUTE ${STK_INSTALL_DATA_DIR} ABSOLUTE)
+        if(${STK_INSTALL_DATA_DIR_ABSOLUTE} STREQUAL ${STK_INSTALL_DATA_DIR})
+            add_definitions(-DSUPERTUXKART_DATADIR=\"${STK_INSTALL_DATA_DIR_ABSOLUTE}\")
+        else()
+            add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/${STK_INSTALL_DATA_DIR}\")
+        endif()
     else()
-        add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/${STK_INSTALL_DATA_DIR}\")
+        add_definitions(-DSUPERTUXKART_DATADIR=\"${STK_INSTALL_DATA_DIR_ABSOLUTE}\")
     endif()
 
     # Build the final executable
-    add_executable(supertuxkart ${STK_SOURCES} ${STK_HEADERS})
+    add_executable(supertuxkart ${STK_SOURCES} ${STK_RESOURCES} ${STK_HEADERS})
     target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
 endif()
 
@@ -242,18 +342,27 @@ target_link_libraries(supertuxkart
     bulletcollision
     bulletmath
     enet
+    glew
     stkirrlicht
+    ${Angelscript_LIBRARIES}
     ${CURL_LIBRARIES}
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
-    ${OPENGL_LIBRARIES})
-    
+    ${OPENGL_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
+    )
+
 if(UNIX AND NOT APPLE)
+    target_link_libraries(supertuxkart ${X11_LIBRARIES})
     if(USE_XRANDR)
         target_link_libraries(supertuxkart ${XRANDR_LIBRARIES})
     else()
         target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY})
     endif()
+    if(USE_ASAN)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+        target_link_libraries(supertuxkart "-fsanitize=address")
+    endif()
 endif()
 
 if(APPLE)
@@ -261,7 +370,7 @@ if(APPLE)
     # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
     # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
     # CMake pick the library it wants essentially means I can't build.
-    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch i386 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
+    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch x86_64 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
 endif()
 
@@ -276,8 +385,8 @@ if(USE_WIIUSE)
     if(APPLE)
         find_library(BLUETOOTH_LIBRARY NAMES IOBluetooth PATHS /Developer/Library/Frameworks/IOBluetooth.framework)
         target_link_libraries(supertuxkart wiiuse ${BLUETOOTH_LIBRARY})
-    elseif(MSVC)
-        add_definitions("/DWIIUSE_STATIC")
+    elseif(WIN32)
+        add_definitions(-DWIIUSE_STATIC)
         if(WIIUSE_BUILD)
             target_link_libraries(supertuxkart wiiuse)
         else()
@@ -290,34 +399,32 @@ if(USE_WIIUSE)
 
 endif()
 
-if(MSVC)
+if(MSVC OR MINGW)
   target_link_libraries(supertuxkart iphlpapi.lib)
   add_custom_command(TARGET supertuxkart POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
         "${PROJECT_SOURCE_DIR}/dependencies/dll"
-        $<TARGET_FILE_DIR:supertuxkart>) 
+        $<TARGET_FILE_DIR:supertuxkart>)
   add_custom_target(stkshaders SOURCES ${STK_SHADERS})
 endif()
 
-# Optional tools
-add_subdirectory(tools/font_tool)
-
-
-# ==== Make dist target ====
-if(MSVC)
-  # Don't create a dist target for VS
-else()
-  add_custom_target(dist
-    COMMAND rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} && rm -f ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2
-            && echo "Exporting..."
-            && svn export ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
-            && echo "Compressing..."
-            && cd ${CMAKE_BINARY_DIR}
-            && tar -cjf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 ./SuperTuxKart-${PROJECT_VERSION}
-            && echo "Done, cleaning up"
-            && rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
+if(MINGW)
+    find_library(LIBGCC NAMES "libgcc_s_dw2-1.dll" "libgcc_s_sjlj-1.dll" "libgcc_s_seh-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
+    if(LIBGCC)
+        file(COPY ${LIBGCC} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
+    endif()
+    find_library(LIBSTDCPP NAMES "libstdc++-6.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
+    if(LIBSTDCPP)
+        file(COPY ${LIBSTDCPP} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
+    endif()
+    find_library(LIBOPENMP NAMES "libgomp-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
+    if(LIBOPENMP)
+        file(COPY ${LIBOPENMP} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
+    endif()
+    find_library(LIBPTHREAD NAMES "winpthread-1.dll" "libwinpthread-1.dll" "pthreadGC2.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
+    if(LIBPTHREAD)
+        file(COPY ${LIBPTHREAD} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
+    endif()
 endif()
 
 
@@ -328,9 +435,9 @@ endif()
 
 # ==== Checking if stk-assets folder exists ====
 if(CHECK_ASSETS)
-  if((IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/karts) AND 
-       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/library) AND 
-       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/music) AND 
+  if((IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/karts) AND
+       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/library) AND
+       (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/music) AND
        (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/sfx) AND
        (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/textures) AND
        (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/tracks))
@@ -356,11 +463,13 @@ install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".
 if(STK_ASSETS_DIR AND CHECK_ASSETS)
   install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${STK_INSTALL_DATA_DIR}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
 endif()
-install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
+install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/applications)
+install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
-install(FILES data/supertuxkart.appdata DESTINATION share/appdata)
+install(FILES data/supertuxkart.appdata.xml DESTINATION share/appdata)
 
-
-set(PREFIX ${CMAKE_INSTALL_PREFIX})
-configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
-add_dependencies(supertuxkart supertuxkart.desktop)
+if(MINGW)
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION ${STK_INSTALL_BINARY_DIR}
+            FILES_MATCHING PATTERN "*.dll")
+endif()

INSTALL.md

@@ -1,6 +1,6 @@
-#SuperTuxKart Installation Instructions
+# SuperTuxKart Installation Instructions
 
-Note : If you obtained this source code from github, you also need to download the game assets from sourceforge using SVN.
+Note: If you obtained this source code from Github, you also need to download the game assets from Sourceforge using SVN.
 
 `svn checkout https://svn.code.sf.net/p/supertuxkart/code/stk-assets stk-assets`
 
@@ -8,7 +8,7 @@ Place the `stk-assets` folder next to the source root `stk-code` folder.
 See <http://supertuxkart.sourceforge.net/Source_control> for more information
 
 
-##Building STK on Linux
+## Building STK on Linux
 
 First, make sure that you have the following packages installed:
 
@@ -18,12 +18,15 @@ First, make sure that you have the following packages installed:
   * Vorbis (libvorbis-dev)
   * libcurl (libcurl-devel)
   * libbluetooth (bluez-devel)
+  * libpng (libpng-devel)
+  * zlib (zlib-devel)
+  * jpeg (libjpeg-turbo-devel)
 
 Ubuntu command:
 
 ```
 sudo apt-get install autoconf automake build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev \
-libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
+libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev libxrandr-dev
 ```
   
 Unpack the files from the tarball like this:
@@ -47,14 +50,18 @@ make VERBOSE=1 -j2
 
 To create a debug version of STK, use:
 
-`cmake .. -DCMAKE_BUILD_TYPE=Debug`
+```
+cmake .. -DCMAKE_BUILD_TYPE=Debug
+```
 
 To test the compilation, supertuxkart can be run from the build
 directory by ./bin/supertuxkart 
 
 To install the file, as root execute:
 
-`make install`
+```
+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
@@ -63,9 +70,9 @@ location, specify `CMAKE_INSTALL_PREFIX` when running cmake, e.g.:
 `cmake .. -DCMAKE_INSTALL_PREFIX=/opt/stk`
 
   
-##Building STK on OS X
+## Building STK on OS X
 See <http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX>
 
 
-##Building STK on Windows
+## Building STK on Windows
 See <http://supertuxkart.sourceforge.net/How_to_build_the_Windows_version>

README.md

@@ -1,4 +1,4 @@
-#SuperTuxKart
+# SuperTuxKart
 [![Build Status](https://travis-ci.org/supertuxkart/stk-code.png?branch=master)](https://travis-ci.org/supertuxkart/stk-code)
 
 SuperTuxKart is a free kart racing game. It is focusing on fun and
@@ -15,7 +15,7 @@ Hope you enjoy the game.
 -- The SuperTuxKart development team.
 
 
-##Hardware Requirements
+## Hardware Requirements
 * You need a 3D graphics card. (NVIDIA GeForce 8xxx and higher, ATI Radeon HD 4xxx and higher or Intel HD 3000 and higher)
 * You should have a CPU that's running at 1GHz or better.
 * You'll need at least 512 MB of free VRAM (video memory).
@@ -23,14 +23,14 @@ Hope you enjoy the game.
 * Ideally, you want a joystick with at least 6 buttons.
 
 
-##Compiling SuperTuxKart
+## Compiling SuperTuxKart
 
-###Windows
-1. Install VS 2012 or later. The free express versions work fine.
+### Windows
+1. Install VS 2013 (or later). The free express versions work fine.
 2. Download and install a source package - either a released package or from our [git/svn repositories](http://supertuxkart.sourceforge.net/Source_control)
 3. Download the latest dependency package depdendencies_for_0.8.2.zip from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directory (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore).
 4. Download cmake and install it. Then start cmake-gui and select the STK root directory as 'Where is the source code', and a new directory in the root directory (next to src, data etc) as build directory (for now I assume that this directory is called bld).
-5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure to select the right version (be aware of the easy to confuse version numbers: VS 2012 = version 11; VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory.
+5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure to select the right version (be aware of the easy to confuse version numbers: VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory.
 6. In Visual Studio open the project file generated in the 'bld' folder
 7. Right click on the supertuxkart project in the solution explorer, and select "Set as StartUp Project".
 8. Select Build->Build Solution (or press F7) to compile.
@@ -38,24 +38,22 @@ Hope you enjoy the game.
 Compilation with cygwin is not officially supported, but
 this has been done (check with the forum for details).
 
-###Mac OS X
+### Mac OS X
 The latest information about compilation on Mac are on our wiki:
 <http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX>
-The Xcode project file is in `/src/ide/Xcode/`, but it still 
-requires that all dependencies are installed as explained on the wiki.
 
-###UNIX
-See `INSTALL` for details.
+### UNIX
+See [`INSTALL.md`](INSTALL.md) for details.
 
 
-##License
+## License
 This software is released under the GNU General Public License (GPL) which
-can be found in the file `LICENSE` in the same directory as this file.
+can be found in the file [`COPYING`](/COPYING) in the same directory as this file.
 Information about the licenses for artwork are contained in 
 `data/licenses`.
 
 
-##3D coordinates
+## 3D coordinates
 A reminder for those looking at the code and 3d models:
 
 STK    : X right, Y up,       Z forwards

TODO.md

@@ -1,8 +1,5 @@
 ##TODO
 
-THIS IS A 2nd TEST.
-THIS IS A TEST.
-
 SuperTuxKart is looking for additional man power to make this
 one of the best free linux games out there :) We need (in 
 no particular order):
@@ -15,17 +12,13 @@ no particular order):
    - Create additional art work for tracks,
      background images
 3. Developers
-   - See todo list below - it's rather long at the moment :)
-4. Web master
+   - Check our bug and enhancement request tracker on
+     https://github.com/supertuxkart/stk-code/issues
    - Extend the current web page, keep it up to date
-5. Tester
+4. Tester
    - For just about everything
-   - Esp. different platforms
-6. Package creators
-   - Create packages for 
-     - most common Linux distributions
-     - Windows
-7. Writers
+   - Esp. different platforms and graphics cards
+5. Writers
    - Write documentation, ranging from man page, to
      a description for the web, to a design document, ...
 

cmake/FindAngelscript.cmake

@@ -0,0 +1,33 @@
+# - Try to find angelscript
+# Once done this will define
+#
+#  ANGELSCRIPT_FOUND - system has angelscript
+#  Angelscript_INCLUDE_DIRS - the angelscript include directory
+#  Angelscript_LIBRARIES - the libraries needed to use angelscript
+#
+
+FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES include
+    )
+
+FIND_LIBRARY(Angelscript_LIBRARY
+    NAMES angelscript angelscript_s
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib lib64 lib32
+    )
+
+# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS)
+
+IF (ANGELSCRIPT_FOUND)
+    SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY})
+ENDIF (ANGELSCRIPT_FOUND)
+
+MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS)

cmake/FindFreetype.cmake

@@ -0,0 +1,29 @@
+# - Find Freetype
+# Find the Freetype includes and libraries
+#
+# Following variables are provided:
+# FREETYPE_FOUND
+#     True if Freetype has been found
+# FREETYPE_INCLUDE_DIRS
+#     The include directories of Freetype
+# FREETYPE_LIBRARIES
+#     Freetype library list
+
+if(WIN32)
+    find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
+    find_library(FREETYPE_LIBRARY NAMES freetype PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+    set(FREETYPE_FOUND 1)
+    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+elseif(APPLE)
+    find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include")
+    find_library(FREETYPE_LIBRARY NAMES freetype PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/")
+    include_directories(/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include)
+    set(FREETYPE_FOUND 1)
+    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+elseif(UNIX)
+    include(FindPkgConfig)
+    pkg_check_modules(FREETYPE freetype2)
+else()
+    set(FREETYPE_FOUND 0)
+endif()
+

cmake/Toolchain-mingw-64bit.cmake

@@ -0,0 +1,20 @@
+# Usage:
+# cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw-64bit.cmake 
+
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
+SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
+SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
+
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /usr/lib/gcc/x86_64-w64-mingw32/4.9-posix ${PROJECT_SOURCE_DIR}/dependencies)
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ALWAYS)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/Toolchain-mingw.cmake

@@ -0,0 +1,20 @@
+# Usage:
+# cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw.cmake 
+
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc-posix)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
+SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
+
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/lib/gcc/i686-w64-mingw32/4.9-posix ${PROJECT_SOURCE_DIR}/dependencies)
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ALWAYS)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

data/SuperTuxKart-Info.plist

@@ -24,5 +24,7 @@
 	<string>0.8.1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>LSMinimumSystemVersion</key>
+    <string>10.9</string>
 </dict>
 </plist>

data/achievements.xml

@@ -1,51 +1,68 @@
 <?xml version="1.0"?>
 <achievements>
   <achievement id="1" check-type="all-at-least" reset-type="never"
-               title="Christoffel Columbus" description="Play every official track at least once." >
+               name="Christoffel Columbus" description="Play every official track at least once." >
+      <city goal="1"/>
+      <cocoa_temple goal="1"/>
       <farm goal="1"/>
-      <scotland goal="1"/>
-      <lighthouse goal="1"/>
-      <sandtrack goal="1"/>
-      <olivermath goal="1"/>
-      <subsea goal="1"/>
-      <mansion goal="1"/>
-      <minigolf goal="1"/>
+      <fortmagma goal="1"/>
+      <gran_paradiso_island goal="1"/>
+      <greenvalley goal="1"/>
       <hacienda goal="1"/>
-      <jungle goal="1"/>      
+      <lighthouse goal="1"/>
+      <mansion goal="1"/>
+      <mines goal="1"/>
+      <minigolf goal="1"/>
+      <olivermath goal="1"/>
+      <sandtrack goal="1"/>
+      <scotland goal="1"/>
+      <snowmountain goal="1"/>
+      <snowtuxpeak goal="1"/>
+      <stk_enterprise goal="1"/>
+      <subsea goal="1"/>
+      <xr591 goal="1"/>
+      <zengarden goal="1"/>      
   </achievement>
   <achievement id="2" check-type="all-at-least" reset-type="never"
-               title="Strike!" description="Hit 10 karts with a bowling-ball.">
+               name="Strike!" description="Hit 10 karts with a bowling-ball.">
     <ball goal="10"/>
   </achievement>
   <achievement id="3" check-type="one-at-least" reset-type="race"
-               title="Arch Enemy" description="Hit the same kart at least 5 times in one race.">
+               name="Arch Enemy" description="Hit the same kart at least 5 times in one race.">
     <hit goal="5"/>
   </achievement>
   <achievement id="4" check-type="all-at-least" reset-type="race"
-               title="Marathoner" description="Make a race with 5 laps or more.">
+               name="Marathoner" description="Make a race with 5 laps or more.">
     <laps goal="5"/>
   </achievement>
   <achievement id="5" check-type="all-at-least" reset-type="lap"
-               title="Skid-row" description="Make 5 skidding in a single lap.">
+               name="Skid-row" description="Make 5 skidding in a single lap.">
     <skidding goal="5"/>
   </achievement>
   <achievement id="6" check-type="all-at-least" reset-type="never"
-               title="Gold driver" description="Win in all single player modes, against at least 3 opponents.">
+               name="Gold driver" description="Win against at least 3 opponents in all single player modes.">
     <standard goal="1"/>
     <std_timetrial goal="1"/>
     <follow_leader goal="1"/>
     <opponents goal="3"/>
   </achievement>
   <achievement id="7" check-type="all-at-least" reset-type="race"
-               title="Powerup Love" description="Use 10 or more powerups in a race.">
+               name="Powerup Love" description="Use 10 or more powerups in a race.">
     <poweruplover goal="10"/>
   </achievement>
   <achievement id="8" check-type="all-at-least" reset-type="never"
-               title="Unstoppable" description="Win 5 single races in a row.">
+               name="Unstoppable" description="Win 5 single races in a row.">
     <wins goal="5"/>
   </achievement>
-  <achievement id="9" check-type="all-at-least" reset-after-race="yes"
-               title="Banana Lover" description="Collect at least 5 bananas in one race.">
+  <achievement id="9" check-type="all-at-least" reset-type="race"
+               name="Banana Lover" description="Collect at least 5 bananas in one race.">
     <banana goal="5"/>
   </achievement>
+  <achievement id="10" secret="yes" check-type="all-at-least" reset-type="race"
+               name="It's secret" description="Really ... a secret.">
+  </achievement>
+  <achievement id="11" check-type="all-at-least" reset-type="race"
+               name="Mosquito Hunter" description="Take your opponents for mosquitos! With the swatter, squash at least 5 of them in a race.">
+    <swatter goal="5"/>
+  </achievement>
 </achievements>

data/addons.supertuxkart.net.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIJAO+A8uXtEMRsMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV
+BAYTAlVTMQwwCgYDVQQIDANTVEsxFTATBgNVBAoMDFN1cGVyVHV4S2FydDEgMB4G
+A1UEAwwXYWRkb25zLnN1cGVydHV4a2FydC5uZXQwHhcNMTQxMjEwMTEzMTAwWhcN
+MjQxMjA3MTEzMTAwWjBUMQswCQYDVQQGEwJVUzEMMAoGA1UECAwDU1RLMRUwEwYD
+VQQKDAxTdXBlclR1eEthcnQxIDAeBgNVBAMMF2FkZG9ucy5zdXBlcnR1eGthcnQu
+bmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ysZE9rb4y0tHOhk
+wxYpqsvDv5LCRFTAeyfAfyBVDcOn+4A3sX8MkQdoH/QDi823z4bn9ZsGV8T444FN
+S4yK/aSRv3eAKkkJm5TUxbs3crATVt3JYusMr5W4wHvRVyDe0DlulSdW4EUEklMP
+iPat/jwlDZRvZueio3wJoOhZXnl8E8EfnuYtlNONIB1nYGdUHD9xeNyKSPr4zTEp
+brjvSw0l5G88LmQOROQBDbTDknAcIQwsFT1mf9Bt+N9LK14r95GWRmL3ZtfbrJn4
+ZEfkOjl0Abv6gET4sQOXv0KioUdEJwzFCwKFLZVcuOrscmcHBOhgD3EruVvprIJ0
+wZ3z1wIDAQABo1AwTjAdBgNVHQ4EFgQUmQwaPsD+ylVUUsUXMAYpUlnVbNwwHwYD
+VR0jBBgwFoAUmQwaPsD+ylVUUsUXMAYpUlnVbNwwDAYDVR0TBAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEASyl6BMpnZhJlirDL84/RkVeVjBkr7x68UFAblmKjgfGg
+pRbYPNSld0IrfZ4pcrDAUkg9WJb0Zxuh0oYiV+RjdW/6s5mF/qiSv8V60xb2myRd
+z90ZGfhB5SAECI5zfIZSmsMjOEjKjuz8S26aEtJe8Vq7GF2P7/889lfNXrbvIkZX
+HQpx2P+T07zy++6Ca/K2vmWcf1a+GrN+o0nZTYbz/2r/JJwXdWqT1ZmtEA9GNwvZ
+J8HhgvspgjgVP/EURUUhOaQ8zfhriU5CJAIuhMhzW7oOBPHxxtxme3auAfxi5zpK
+wRNluCayrrjhy2I8mABRnBqgMwAQUIrgk9IU6SyQxw==
+-----END CERTIFICATE-----

data/challenges/hacienda.challenge

@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="190"/>
+        <requirements time="185"/>
     </medium>
     <easy>
         <karts number="4"/>

data/challenges/islandtrack.challenge

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

data/challenges/jungle.challenge

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

data/challenges/lighthouse.challenge

@@ -10,11 +10,11 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="125"/>
+        <requirements time="145" position="1"/>
     </medium>
     <easy>
         <karts number="3"/>
-        <requirements time="145"/>
+        <requirements time="185"/>
     </easy>
 </challenge>
 

data/challenges/mansion.challenge

@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="145"/>
+        <requirements time="130"/>
     </medium>
     <easy>
         <karts number="4"/>

data/challenges/mines.challenge

@@ -14,6 +14,6 @@
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="215"/>
+        <requirements time="255"/>
     </easy>
 </challenge>

data/challenges/olivermath.challenge

@@ -6,15 +6,15 @@
     
     <hard>
         <karts number="5"/>
-        <requirements position="1" time="50"/>
+        <requirements position="1" time="65"/>
     </hard>
     <medium>
         <karts number="5"/>
-        <requirements position="1" time="65"/>
+        <requirements position="1" time="85"/>
     </medium>
     <easy>
         <karts number="5"/>
-        <requirements position="1" time="80"/>
+        <requirements position="1" time="105"/>
     </easy>
 </challenge>
 

data/challenges/sandtrack.challenge

@@ -6,14 +6,14 @@
     
     <hard>
         <karts number="1"/>
-        <requirements energy="16" time="167"/>
+        <requirements energy="18" time="167"/>
     </hard>
     <medium>
         <karts number="1"/>
-        <requirements energy="12" time="185"/>
+        <requirements energy="15" time="195"/>
     </medium>
     <easy>
         <karts number="1"/>
-        <requirements energy="10" time="220"/>
+        <requirements energy="10" time="260"/>
     </easy>
 </challenge>

data/challenges/scotland.challenge

@@ -10,10 +10,10 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="175"/>
+        <requirements time="185"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="225"/>
+        <requirements time="270"/>
     </easy>
 </challenge>

data/challenges/snowmountain.challenge

@@ -10,10 +10,10 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="175"/>
+        <requirements time="187"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="220"/>
+        <requirements time="250"/>
     </easy>
 </challenge>

data/challenges/snowpeak.challenge

@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="175"/>
+        <requirements time="170"/>
     </medium>
     <easy>
         <karts number="4"/>

data/challenges/startrack.challenge

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="startrack" laps="3"/>
+    <track id="stk_enterprise" laps="3"/>
     <mode major="single" minor="followtheleader"/>
     <requirements trophies="110"/>
     

data/challenges/subsea.challenge

@@ -6,14 +6,14 @@
     
     <hard>
         <karts number="5"/>
-        <requirements position="1" time="200"/>
+        <requirements position="1" time="205"/>
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="220"/>
+        <requirements time="258"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="250"/>
+        <requirements time="330"/>
     </easy>
 </challenge>

data/challenges/xr591.challenge

@@ -6,15 +6,15 @@
     
     <hard>
         <karts number="1"/>
-        <requirements energy="18" time="135"/>
+        <requirements energy="18" time="120"/>
     </hard>
     <medium>
         <karts number="1"/>
-        <requirements energy="15" time="155"/>
+        <requirements energy="15" time="135"/>
     </medium>
     <easy>
         <karts number="1"/>
-        <requirements energy="12" time="170"/>
+        <requirements energy="12" time="180"/>
     </easy>
 </challenge>
 

data/gfx/black_smoke.xml

@@ -4,25 +4,27 @@
     <spreading angle="10"        />
     
     <velocity  x="0.0"
-               y="0.002"
+               y="0.003"
                z="0.0"           />
     
     <material  file="smoke_black.png"  />
     
     <!-- Amount of particles emitted per second -->
-    <rate      min="25"
-               max="50"          />
+    <rate      min="7"
+               max="12"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
     <lifetime  min="2500"
                max="5000"        />
     
     <!-- Size of the particles -->
-    <size      min="0.6"
-               max="1.5"         />
+    <size      min="1.6"
+               max="2.5"
+               x-increase-factor="2.6"
+               y-increase-factor="2.6"         />
 
-    <color     min="255 255 255"
-               max="255 255 255" />
+    <color     min="50 50 50"
+               max="100 100 100" />
 
     <!-- How much time in milliseconds before the particle is fully faded out  -->
     <fadeout   time="1000"       />

data/gfx/confetti.xml

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

data/gfx/confetti_bleu.xml

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

data/gfx/droplet.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<particles emitter="sphere" radius="5">
+<particles emitter="sphere" radius="2">
 
-    <spreading angle="45"      />
+    <spreading angle="12"      />
     
     <velocity  x="0.000"
                y="0.005"
@@ -18,8 +18,8 @@
                max="2000"         />
     
     <!-- Size of the particles -->
-    <size      min="4.0"
-               max="7.2"       
+    <size      min="2.0"
+               max="3.2"       
                x-increase-factor="2.6"
                y-increase-factor="2.6" />
     

data/gfx/gfx_blueNebula_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="20.5">
+
+    <spreading angle="120"      />
+    
+    <velocity  x="0.002"
+               y="0.000"
+               z="0.000"         />
+    
+    <material  file="stktex_nebulaCloud_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="1"
+               max="2"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="20000"
+               max="30000"         />
+    
+    <!-- Size of the particles -->
+   <size min="20.5"
+         max="45.0"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="5000" />
+
+
+</particles>

data/gfx/gfx_bubbleFast_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="box" box_x="0.5" box_y="0.5" box_z="0.5">
+
+    <spreading angle="45"      />
+    
+    <velocity  x="0.000"
+               y="0.005"
+               z="0.000"         />
+    
+    <material  file="gfx_bubble_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="8"
+               max="15"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="2000"
+               max="3000"         />
+    
+    <!-- Size of the particles -->
+   <size min="0.5"
+         max="0.8"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="2000" />
+
+
+</particles>

data/gfx/gfx_bubble_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="box" box_x="0.5" box_y="0.5" box_z="0.5">
+
+    <spreading angle="45"      />
+    
+    <velocity  x="0.000"
+               y="0.005"
+               z="0.000"         />
+    
+    <material  file="gfx_bubble_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="3"
+               max="6"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="3000"
+               max="6000"         />
+    
+    <!-- Size of the particles -->
+   <size min="1.1"
+         max="1.5"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="5000" />
+
+
+</particles>

data/gfx/gfx_fireworkExplosion_a.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.5">
+
+    <spreading angle="180"         />
+    
+    <velocity  x="0.003"
+               y="0.0003"
+               z="0.003"           />
+    
+    <material  file="gfx_sparkFire_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="65"
+               max="100" />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="1700"
+               max="1700"         />
+    
+    <!-- Size of the particles -->
+    <size      min="0.7"
+               max="1.1"
+               x-increase-factor="1.3"
+               y-increase-factor="1.3"
+               />
+    
+    <color     min="255 255 255"
+               max="255 0 0"  />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="50"         />
+
+</particles>

data/gfx/gfx_fireworkGreen_a.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.5">
+
+    <spreading angle="180"         />
+    
+    <velocity  x="0.03"
+               y="0.003"
+               z="0.03"           />
+    
+    <material  file="gfx_sparkGreen_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="65"
+               max="100" />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="2700"
+               max="2700"         />
+    
+    <!-- Size of the particles -->
+    <size      min="0.5"
+               max="0.8"
+               x-increase-factor="1.1"
+               y-increase-factor="1.3"
+               />
+    
+    <color     min="255 255 255"
+               max="255 0 0"  />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="50"         />
+
+</particles>

data/gfx/gfx_fireworkSmoke_a.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="sphere" radius="0.1">
+
+    <spreading angle="5"           />
+    
+    <velocity  x="-0.000"
+               y="0.002"
+               z="-0.000"             />
+    
+    <material  file="smoke.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="5"
+               max="10"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="100"
+               max="300"          />
+    
+    <!-- Size of the particles -->
+    <size min="0.2"
+         max="0.5"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" /> 
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+
+</particles>

data/gfx/gfx_firework_a.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="sphere" radius="0.1">
+
+    <spreading angle="5"           />
+    
+    <velocity  x="-0.000"
+               y="0.002"
+               z="-0.000"             />
+    
+    <material  file="gfx_sparkFire_a.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="20"
+               max="50"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="400"
+               max="500"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.2"
+               max="0.3"          />
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>

data/gfx/gfx_jetBlastEarth_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="2.5">
+
+    <spreading angle="90"      />
+    
+    <velocity  x="0.010"
+               y="0.000"
+               z="0.000"         />
+    
+    <material  file="gfx_earthJetblast_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="6"
+               max="12"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="1000"
+               max="2000"         />
+    
+    <!-- Size of the particles -->
+   <size min="3.5"
+         max="6.0"
+         x-increase-factor="2.6"
+         y-increase-factor="2.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="5000" />
+
+
+</particles>

data/gfx/gfx_jetBlastSand_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="2.5">
+
+    <spreading angle="90"      />
+    
+    <velocity  x="0.010"
+               y="0.000"
+               z="0.000"         />
+    
+    <material  file="gfx_sandJetblast_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="6"
+               max="12"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="1000"
+               max="2000"         />
+    
+    <!-- Size of the particles -->
+   <size min="3.5"
+         max="6.0"
+         x-increase-factor="2.6"
+         y-increase-factor="2.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="5000" />
+
+
+</particles>

data/gfx/gfx_mudPot_a.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="box" box_x="0.01" box_y="0.5" box_z="0.01">
+
+    <spreading angle="30"           />
+    
+    <velocity  x="-0.000"
+               y="0.002"
+               z="-0.000"             />
+    
+    <material  file="gfx_mud_a.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="5"
+               max="8"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="900"
+               max="1000"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.3"
+               max="0.5"         
+               x-increase-factor="2.6"
+               y-increase-factor="2.6" />
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="1000"          />
+
+
+</particles>

data/gfx/gfx_sandExplosion_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.5">
+
+    <spreading angle="90"      />
+    
+    <velocity  x="0.000"
+               y="0.003"
+               z="0.000"        />
+    
+    <material  file="gfx_earthJetblast_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="900"
+               max="1000"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="300"
+               max="1000"         />
+    
+    <!-- Size of the particles -->
+   <size min="0.3"
+         max="0.7"
+         x-increase-factor="1.2"
+         y-increase-factor="1.2" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="500" />
+
+
+</particles>

data/gfx/gfx_smallWaterFlow.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.1">
+
+    <spreading angle="12"      />
+    
+    <velocity  x="0.000"
+               y="0.000"
+               z="0.005"         />
+    
+    <material  file="particle_water.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="30"
+               max="50"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="500"
+               max="1000"         />
+    
+    <!-- Size of the particles -->
+    <size      min="0.1"
+               max="0.2"       
+               x-increase-factor="1.3"
+               y-increase-factor="1.3" />
+    
+    <color     min="255 255 255"
+               max="255 255 255" />
+
+    <fadeout   time="3000" />
+
+
+</particles>

data/gfx/gfx_sparkBlue_a.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="sphere" radius="0.2">
+
+    <spreading angle="10"           />
+    
+    <velocity  x="-0.000"
+               y="0.003"
+               z="-0.000"             />
+    
+    <material  file="gfx_sparkBlue_a.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="20"
+               max="50"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="1000"
+               max="1500"          />    
+  
+    <!-- Size of the particles -->
+    <size min="0.08"
+         max="0.15"
+         x-increase-factor="1.2"
+         y-increase-factor="1.3" /> 
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>

data/gfx/gfx_sparkFire_a.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 
 <!-- For sky particles, the size of the box is ignored -->
-<particles emitter="box" box_x="0.1" box_y="0.5" box_z="0.1">
+<particles emitter="sphere" radius="0.5">
 
-    <spreading angle="30"           />
+    <spreading angle="5"           />
     
     <velocity  x="-0.000"
                y="0.002"
@@ -16,7 +16,7 @@
                max="50"           />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="3000"
+    <lifetime  min="1000"
                max="3000"          />
     
     <!-- Size of the particles -->

data/gfx/nitro-smoke.xml

@@ -4,18 +4,18 @@
     <spreading angle="30"         />
     
     <velocity  x="0.0"
-               y="0.001"
-               z="-0.003"         />
+               y="0.0"
+               z="-0.006"         />
     
     <material  file="smoke_nitro.png"  />
     
     <!-- Amount of particles emitted per second -->
-    <rate      min="200"
-               max="300"          />
+    <rate      min="500"
+               max="800"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="400"
-               max="600"          />
+    <lifetime  min="100"
+               max="150"          />
     
     <!-- Size of the particles -->
     <size      min="0.20"
@@ -25,6 +25,6 @@
                max="255 255 255"  />
     
     <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"         />
+    <fadeout   time="75"         />
 
 </particles>

data/gfx/nitro.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="0.05" box_y="0.05" box_z="0.05">
+<particles emitter="box" box_x="0.05" box_y="0.05" box_z="0.60">
 
     <spreading angle="2"         />
     
     <velocity  x="0.0"
-               y="0.001"
-               z="0.000"         />
+               y="0.0"
+               z="-0.003"         />
     
     <material  file="nitro-particle.png"  />
     
     <!-- Amount of particles emitted per second -->
-    <rate      min="100"
-               max="200" />
+    <rate      min="600"
+               max="800"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="10"
-               max="20"          />
+    <lifetime  min="85"
+               max="120"           />
     
     <!-- Size of the particles -->
     <size      min="0.1"
@@ -28,6 +28,6 @@
                max="255 255 255"  />
     
     <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
+    <fadeout   time="50"         />
 
 </particles>

data/gfx/rain.xml

@@ -1,39 +1,33 @@
 <?xml version="1.0"?>
-<!--
-  Particle system to simulate it's raining heavily over an item/kart.
-  It should be applied no matter if kart is flying or on (any) ground,
-  and rotate to always fire up, it just simulates the rain bouncing
-  off the kart and being fired by wheels. It could also be applied to
-  bowling balls, for example.
--->
-<particles emitter="box" box_x="0.5" box_y="1.0" box_z="1.0">
 
-    <spreading angle="10"       />
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="box" randomize-initial-y="true">
+
+    <spreading angle="3"           />
     
-    <velocity  x="0.000"
-               y="0.009"
-               z="0.000"         />
+    <velocity  x="-0.00"
+               y="-0.03"
+               z="-0.00"             />
     
-    <material  file="water-splash.png"  />
+    <material  file="rain.png" clampu="Y" clampv="Y" />
     
     <!-- Amount of particles emitted per second -->
-    <rate      min="50"
-               max="60"         />
+    <rate      min="100"
+               max="250"           />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1000"
-               max="1000"         />
+    <lifetime  min="10000"
+               max="10000"          />
     
     <!-- Size of the particles -->
-    <size      min="0.35"
-               max="0.70"        />
-
+    <size      min="1.00"
+               max="1.50"          />
+    
     <color     min="255 255 255"
-               max="255 255 255" />
-
+               max="255 255 255"   />
+    
     <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="750"        />
+    <fadeout   time="100"          />
+
 
-    <gravity   strength="-0.01"
-               only-force-time="500" />
 </particles>

data/gfx/skid1.xml

@@ -4,7 +4,7 @@
     <spreading angle="5"          />
     
     <velocity  x="0.0"
-               y="0.001"
+               y="0.0"
                z="-0.003"         />
     
     <material  file="skid-particle1.png"  />
@@ -12,16 +12,16 @@
     <!-- 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="900"
-               max="900"          />
+    <rate      min="1400"
+               max="1500"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="10"
-               max="10"          />
+    <lifetime  min="15"
+               max="25"          />
     
     <!-- Size of the particles -->
     <size      min="0.35"
-               max="0.35"         />
+               max="0.45"         />
     
     <color     min="255 255 255"
                max="255 255 255"  />

data/gfx/skid2.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <particles emitter="box" box_x="0.023" box_y="0.023" box_z="-0.5">
 
-    <spreading angle="5"         />
+    <spreading angle="5"          />
     
     <velocity  x="0.0"
-               y="0.001"
+               y="0.0"
                z="-0.003"         />
     
     <material  file="skid-particle2.png"  />
@@ -12,16 +12,16 @@
     <!-- 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="900"
-               max="900"          />
+    <rate      min="1400"
+               max="1500"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="10"
-               max="10"          />
+    <lifetime  min="15"
+               max="25"          />
     
     <!-- Size of the particles -->
     <size      min="0.35"
-               max="0.75"         />
+               max="0.45"         />
     
     <color     min="255 255 255"
                max="255 255 255"  />

data/gfx/snow.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!-- For sky particles, the size of the box is ignored -->
-<particles emitter="box">
+<particles emitter="box" randomize-initial-y="true">
 
     <spreading angle="3"           />
     
@@ -16,12 +16,12 @@
                max="1000"           />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="10000"
-               max="10000"          />
+    <lifetime  min="8500"
+               max="9500"          />
     
     <!-- Size of the particles -->
-    <size      min="0.40"
-               max="0.60"          />
+    <size      min="0.10"
+               max="0.30"          />
     
     <color     min="40 40 255"
                max="255 255 255"   />

data/gfx/waterfall.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="12.0" box_y="0.5" box_z="12.0">
+<particles emitter="box" box_x="3.0" box_y="0.5" box_z="3.0">
 
-    <spreading angle="24"      />
+    <spreading angle="45"      />
     
     <velocity  x="0.000"
-               y="0.005"
+               y="0.001"
                z="0.000"         />
     
     <material  file="waterparticles.png"  />
     
     <!-- Amount of particles emitted per second -->
-    <rate      min="5"
-               max="20"         />
+    <rate      min="1"
+               max="6"         />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
     <lifetime  min="1000"

data/grandprix/2_offthebeatentrack.grandprix

@@ -1,7 +1,7 @@
 
 <supertuxkart_grand_prix name="Off the beaten track">
 
-    <track id="jungle"       laps="3" reverse="false" />
+    <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" />

data/grandprix/3_tothemoonandback.grandprix

@@ -1,11 +1,11 @@
 
 <supertuxkart_grand_prix name="To the moon and back">
 
-    <track id="islandtrack"    laps="3" reverse="false" />
-    <track id="greenvalley"    laps="2" reverse="false" />
-    <track id="mansion"        laps="3" reverse="false" />
-    <track id="startrack"      laps="3" reverse="false" />
-    <track id="city"           laps="2" reverse="false" />
+    <track id="gran_paradiso_island" laps="3" reverse="false" />
+    <track id="greenvalley"          laps="2" reverse="false" />
+    <track id="mansion"              laps="3" reverse="false" />
+    <track id="stk_enterprise"       laps="3" reverse="false" />
+    <track id="city"                 laps="2" reverse="false" />
     
 </supertuxkart_grand_prix>
 

data/graphical_restrictions.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<graphical-restrictions>
+  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="UniformBufferObject"/>
+  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="AdvancedPipeline"/>
+  <card is="Intel(R) HD Graphics 3000" os="windows"                disable="FramebufferSRGBWorking"/>
+  <card contains="Intel"          os="osx"                         disable="GI"/>
+  <card contains="Intel"          os="linux"    version="<12.0"    disable="ComputeShader"/>
+  <card contains="Intel"          os="linux"    version="<12.0"    disable="FramebufferSRGBCapable"/>
+  <card contains="Intel"                                           disable="TextureCompressionS3TC"/>
+  <card contains="Intel"          os="windows"                     disable="HighDefinitionTextures"/>
+  <card contains="NVIDIA"         os="windows"  version="<344.65"  disable="BufferStorage"/>
+  <card contains="NVIDIA"         os="linux"    version="<343.22"  disable="BufferStorage"/>
+  <card contains="NVIDIA"                                          disable="ShaderAtomicCounters"/>
+  <card contains="Mesa"           os="linux"    version="<10.3"    disable="BufferStorage"/>
+  <card contains="Mesa"           os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
+  <card contains="Mesa"           os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Mesa"           os="linux"                       disable="TextureCompressionS3TC"/>
+  <card contains="Gallium"        os="linux"    version="<10.3"    disable="BufferStorage"/>
+  <card contains="Gallium"        os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
+  <card contains="Gallium"        os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Gallium"        os="linux"                       disable="TextureCompressionS3TC"/>
+  <!-- On osx radeon appears to have different version numbers, e.g.
+       1.32.20 -->
+  <card contains="Radeon"         os="linux"    version="<14.300"  disable="DriverRecentEnough"/>
+  <card contains="Radeon"         os="windows"  version="<14.300"  disable="DriverRecentEnough"/>
+</graphical-restrictions>
+

data/gui/addons_loading.stkgui

@@ -1,45 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
-
-
-      <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row" >
-        <div width="40%" height="100%" layout="vertical-row" >
-            <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png"/>
-            <spacer proportion="1" />
-        </div>
-        <spacer proportion="1" />
-        <div width="60%" height="50%" layout="vertical-row" >
-            <label id="name" width="100%" text_align="left"/>
-            <div width="100%" height="100%" layout="horizontal-row" >
-                <div width="50%" height="100%" layout="vertical-row" >
-                    <label id="size"     width="100%" text=""/>
-                    <label id="revision" width="100%" text=""/>
-                </div>
-                <div width="50%" height="32" layout="vertical-row" >
-                    <ratingbar id="rating" height="64" width="100%" />
-                </div>
+        <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" />
+                <spacer proportion="1" />
+            </div>
+            <spacer proportion="1" />
+            <div width="60%" height="50%" layout="vertical-row">
+                <label id="name" width="100%" text_align="left"/>
+                <div width="100%" height="100%" layout="horizontal-row">
+                    <div width="50%" height="100%" layout="vertical-row">
+                        <label id="size"     width="100%" text="" />
+                        <label id="revision" width="100%" text="" />
+                    </div>
+                    <div width="50%" height="32" layout="vertical-row">
+                        <ratingbar id="rating" height="64" width="100%" />
+                    </div>
+                </div>
+                <spacer height="10"/>
+                <label id="flags"    width="100%" text="" word_wrap="true" />
             </div>
-            <spacer height="10"/>
-            <label id="flags"    width="100%" text="" word_wrap="true"/>
         </div>
-      </div>
 
-      <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="5" align="center" />
-
-      <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"
-                         I18N="Add-on screen action"  text="Install"/>
-            <icon-button id="uninstall" width="128" height="128"
-                         icon="gui/package-uninstall.png"
-                         I18N="Add-on screen action" text="Uninstall"/>
-            <icon-button id="back" width="128" height="128"
-                         icon="gui/back.png"
-                         I18N="Add-ons screen action" text="Back"/>
-        </buttonbar>
-        <progressbar id="progress" x="0" y="20%" width="100%" height="30%"  />
-      </div>
+        <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="5" align="center" />
+        <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"
+                             I18N="Add-on screen action"  text="Install" />
+                <icon-button id="uninstall" width="128" height="128"
+                             icon="gui/package-uninstall.png"
+                             I18N="Add-on screen action" text="Uninstall" />
+                <icon-button id="back" width="128" height="128"
+                             icon="gui/back.png"
+                             I18N="Add-on screen action" text="Back" />
+            </buttonbar>
+            <progressbar id="progress" x="0" y="20%" width="100%" height="30%" />
+        </div>
     </div>
 </stkgui>

data/gui/addons_screen.stkgui

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
-
         <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
             <icon-button id="back"   height="100%" icon="gui/back.png"/>
             <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
@@ -14,8 +13,8 @@
                 <spacer width="10" />
                 <label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/>
                 <spinner id="filter_date" proportion="8" align="center" min_value="0" wrap_around="true"/>
-                <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating"/>
-                <spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/>
+                <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only items with good rating"/>
+                <spinner id="filter_rating" proportion="5" align="center" min_value="0" wrap_around="true"/>
                 <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
             </div>
         </box>
@@ -24,16 +23,15 @@
 
         <tabs id="category" height="10%" max_height="110" width="90%" align="center">
             <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
-                    I18N="Section in the addons menu" text="Karts"/>
+                    I18N="In the addons screen" text="Karts"/>
             <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
-                    I18N="Section in the addons menu" text="Tracks"/>
+                    I18N="In the addons screen" text="Tracks"/>
             <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
-                    I18N="Section in the addons menu" text="Arenas"/>
+                    I18N="In the addons screen" text="Arenas"/>
         </tabs>
 
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
             <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
         </box>
-
     </div>
 </stkgui>

data/gui/challenges.stkgui

@@ -1,20 +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="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
-
-        <header I18N="Title for challenges screen" text="Challenges : Trophy Room" text_align="center" align="center" width="80%" />
-
-        <spacer height="5" width="100%"/>
-
-        <box width="100%" proportion="5" layout="vertical-row">
-
-            <ribbon_grid id="challenges" proportion="8" width="100%"
-                label_location="bottom" align="center" child_width="128" child_height="128" />
-
-
-            <spacer proportion="1" width="100%"/>
-        </box>
-    </div>
-</stkgui>

data/gui/custom_video_settings.stkgui

@@ -25,9 +25,20 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <spacer width="70" height="10" />
-            <label text="Shadows" I18N="Video settings"/>
-            <spacer width="10" height="10"/>
-            <gauge id="shadows" min_value="0" max_value="2" width="50%"/>
+            
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <label text="Shadows" I18N="Video settings"/>
+                <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" />

data/gui/debug_slider.stkgui

@@ -1,7 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
-        <label id="title" width="100%"/>
-        <gauge id="value_slider" min_value="0" max_value="100" width="100%" />
+        <div proportion="1" width="100%" layout="horizontal-row">
+            <label id="Red" raw_text="Red" width="200"/>
+            <spacer width="25"/>
+            <gauge id="red_slider" min_value="0" max_value="100" proportion="1"/>
+        </div>
+
+        <div proportion="1" width="100%" layout="horizontal-row">
+            <label id="Green" raw_text="Green" width="200"/>
+            <spacer width="25"/>
+            <gauge id="green_slider" min_value="0" max_value="100" proportion="1"/>
+        </div>
+
+        <div proportion="1" width="100%" layout="horizontal-row">
+            <label id="Blue" raw_text="Blue" width="200"/>
+            <spacer width="25"/>
+            <gauge id="blue_slider" min_value="0" max_value="100" proportion="1"/>
+        </div>
+
+        <div proportion="1" width="100%" layout="horizontal-row">
+            <label id="SSAO radius" raw_text="SSAO Radius" width="200"/>
+            <spacer width="50"/>
+            <gauge id="ssao_radius" min_value="0" max_value="100" proportion="1" />
+        </div>
+
+        <div proportion="1" width="100%" layout="horizontal-row">
+            <label id="SSAO k" raw_text="SSAO K" width="200"/>
+            <spacer width="25"/>
+            <gauge id="ssao_k" min_value="0" max_value="100" proportion="1"/>
+        </div>
+
+        <div proportion="1" width="100%" layout="horizontal-row">
+            <label id="SSAO Sigma" raw_text="SSAO sigma" width="200"/>
+            <spacer width="50"/>
+            <gauge id="ssao_sigma" min_value="0" max_value="100" proportion="1"/>
+        </div>
     </div>
 </stkgui>

data/gui/edit_gp.stkgui

@@ -20,13 +20,13 @@
                 I18N="Menu item" text="Move up" />
             <icon-button id="down" width="128" height="128" icon="gui/down.png"
                 I18N="Menu item" text="Move down" />
-            <icon-button id="add" width="128" height="128" icon="gui/gp_add_track.png"
+            <icon-button id="add" width="128" height="128" icon="gui/blue_plus.png"
                 I18N="Menu item" text="Add" />
-            <icon-button id="edit" width="128" height="128" icon="gui/gp_edit_track.png"
+            <icon-button id="edit" width="128" height="128" icon="gui/edit.png"
                 I18N="Menu item" text="Edit" />
-            <icon-button id="remove" width="128" height="128" icon="gui/gp_remove_track.png"
+            <icon-button id="remove" width="128" height="128" icon="gui/remove.png"
                 I18N="Menu item" text="Remove" />
-            <icon-button id="save" width="128" height="128" icon="gui/gp_save.png"
+            <icon-button id="save" width="128" height="128" icon="gui/save.png"
                 I18N="Menu item" text="Save" />
         </buttonbar>
     </div>

data/gui/enter_gp_name_dialog.stkgui

@@ -11,10 +11,10 @@
         <textbox id="textfield" width="75%" I18N="In the 'add new grand prix' dialog" align="center"/>
 
         <spacer height="20" width="20" />
-
-        <button id="cancel" I18N="When configuring input" text="Press ESC to cancel" align="center"/>
-
+        
+        <button id="accept" I18N="In the 'add new grand prix' dialog" text="OK" align="center" proportion="1"/>
         <spacer height="15" width="20" />
-
+        <button id="cancel" I18N="In the 'add new grand prix' dialog" text="Cancel" align="center" proportion="1"/>
+        
     </div>
 </stkgui>

data/gui/enter_player_name_dialog.stkgui

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
-
-        <label id="title" width="100%" text_align="center" word_wrap="true"
-               I18N="In the 'add new player' dialog" text="Enter the new player's name" proportion="1" />
-
-        <spacer height="25" width="10" />
-
-        <textbox id="textfield" width="75%" I18N="In the 'add new player' dialog" align="center"/>
-
-        <spacer height="20" width="20" />
-
-        <buttonbar proportion="1" id="options" width="100%" height="100%">
-            <button id="ok"     I18N="When configuring input" text="OK" align="center"/>
-            <button id="cancel" I18N="When configuring input" text="Cancel" align="center"/>
-        </buttonbar>
-        <spacer height="15" width="20" />
-
-    </div>
-</stkgui>

data/gui/ghost_replay_info_dialog.stkgui

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
+        <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row">
+            <div width="40%" height="100%" layout="vertical-row">
+                <icon id="icon" align="center" width="100%" icon="gui/loading.png" />
+            </div>
+            <div width="60%" height="50%" layout="vertical-row">
+                <label id="name" width="100%" text_align="left"/>
+            </div>
+        </div>
+
+        <div width="90%" align="center" layout="vertical-row" height="fit">
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <checkbox width="fit" id="record-race" I18N="Ghost replay info action" text_align="left"/>
+                <spacer width="10"/>
+                <label proportion="1" id="record-race-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Record the race for ghost replay"/>
+            </div>
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <checkbox width="fit" id="watch-only" I18N="Ghost replay info action" text_align="left"/>
+                <spacer width="10"/>
+                <label proportion="1" id="watch-only-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Watch replay only"/>
+            </div>
+        </div>
+
+        <div width="80%" proportion="5" align="center">
+            <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
+                <icon-button id="start" width="128" height="128"
+                             icon="gui/green_check.png"
+                             I18N="Ghost replay info screen action" text="Start Race" />
+                <icon-button id="remove" width="128" height="128"
+                             icon="gui/remove.png"
+                             I18N="Ghost replay info action" text="Remove" />
+                <icon-button id="back" width="128" height="128"
+                             icon="gui/back.png"
+                             I18N="Ghost replay info action" text="Back" />
+            </buttonbar>
+        </div>
+    </div>
+</stkgui>

data/gui/ghost_replay_selection.stkgui

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="0%" y="1%" width="100%" height="98%" layout="vertical-row" >
+
+        <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
+            <icon-button id="back" height="100%" icon="gui/back.png"/>
+            <header text_align="center" proportion="1" I18N="In the ghost replay selection screen" text="Ghost Replay Selection" align="center"/>
+            <icon-button id="reload" height="90%" icon="gui/restart.png"/>
+        </div>
+
+        <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
+            <list id="replay_list" x="0" y="0" width="100%" height="100%"/>
+        </box>
+
+        <spacer width="100%" height="2%" />
+        <button x="1%" id="record-ghost" I18N="In the ghost replay selection screen" text="Record ghost replay" />
+    </div>
+</stkgui>

data/gui/gp_info.stkgui

@@ -0,0 +1,63 @@
+<?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="96%" height="96%" layout="vertical-row">
+
+        <header id="name" height="5%" width="80%" align="center" text_align="center"/>
+
+        <spacer width="1" height="5%"/>
+
+        <box width="100%" height="40%" padding="10" layout="horizontal-row">
+            <spacer width="10" height="100%"/>
+            <!-- Left pane -->
+            <div width="45%" height="100%" align="center" layout="vertical-row">
+                <icon-button proportion="1" width="100%" height="100%" id="screenshot" custom_ratio="1.33333"/>
+            </div>
+
+            <spacer width="5%" height="100%"/>
+
+            <!-- Right pane -->
+            <div width="45%" height="95%" align="center" layout="vertical-row">
+                <list id="tracks" width="100%" height="100%"/>
+            </div>
+
+        </box>
+        <spacer width="1" height="5%"/>
+        <box width="100%" height="28%" padding="20" layout="vertical-row">
+            <div width="100%" height="20%" layout="horizontal-row" >
+                <label   id="ai-text"         width="50%" I18N="In the grand prix info screen" text="AI karts" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="ai-spinner"      width="30%" min_value="1" max_value="20" align="center" wrap_around="true" />
+            </div>
+            <spacer height="5%" />
+            <div width="100%" height="20%" layout="horizontal-row" >
+                <label   id="reverse-text"    width="50%" I18N="In the grand prix info screen" text="Reverse" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="reverse-spinner" width="30%" align="center" wrap_around="true" />
+            </div>
+            <spacer height="5%" />
+            <div width="100%" height="20%" layout="horizontal-row">
+                <label   id="track-text"      width="50%" I18N="In the grand prix info screen" text="Tracks" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="track-spinner"   width="30%" min_value="1" max_value="20" align="center" wrap_around="true" />
+            </div>
+            <spacer height="5%" />
+            <div width="100%" height="20%" layout="horizontal-row" >
+                <label   id="group-text"      width="50%" I18N="In the grand prix info screen" text="Track group" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="group-spinner"   width="30%" align="center" wrap_around="true" />
+            </div>
+        </box>
+        <spacer height="2%"/>
+        <buttonbar id="buttons" height="15%" width="100%" align="center">
+
+            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
+                    I18N="In the grand prix info screen" text="Start Race"/>
+
+            <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
+                    I18N="In the grand prix info screen" text="Continue saved GP"/>
+        </buttonbar>
+
+    </div>
+</stkgui>

data/gui/grand_prix_editor.stkgui

@@ -15,11 +15,13 @@
                 child_height="120" keep_selection="true" />
         </box>
 
-        <spacer height="10" />
+        <!-- Populated dynamically at runtime -->
+        <tabs width="100%" height="30" id="gpgroups"> </tabs>
+
+        <spacer height="20" />
 
         <box proportion="2" width="100%" layout="vertical-row">
-            <label id="gpname" text_align="center" width="100%"
-                I18N="In the grand prix editor screen" text="" />
+            <label id="gpname" text_align="center" width="100%" text="" />
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
                 label_location="each" align="left" max_rows="1"
                 child_width="160" child_height="120" />
@@ -32,11 +34,11 @@
                 I18N="Menu item" text="New" />
             <icon-button id="copy" width="128" height="128" icon="gui/gp_copy.png"
                 I18N="Menu item" text="Copy" />
-            <icon-button id="edit" width="128" height="128" icon="gui/gp_edit.png"
+            <icon-button id="edit" width="128" height="128" icon="gui/edit.png"
                 I18N="Menu item" text="Edit" />
             <icon-button id="remove" width="128" height="128" icon="gui/gp_remove.png"
                 I18N="Menu item" text="Remove" />
-            <icon-button id="rename" width="128" height="128" icon="gui/gp_rename.png"
+            <icon-button id="rename" width="128" height="128" icon="gui/rename.png"
                 I18N="Menu item" text="Rename" />
         </buttonbar>
 

data/gui/grand_prix_lose.stkgui

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer width="10" proportion="1"/>
-        <button id="continue" x="20" width="250" align="left" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
     </div>
 </stkgui>

data/gui/grand_prix_win.stkgui

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer width="10" proportion="1"/>
-        <button id="continue" x="20" width="250" align="left" text="Continue"/>
+    <div x="2%" y="2%" width="96%" height="96%" layout="horizontal-row">
+        <button id="continue" width="250" align="bottom" text="Continue"/>
+        <spacer width="20"/>
+        <button id="save"     width="250" align="bottom" text="Save Grand Prix"/>
     </div>
 </stkgui>
+