Fix GCC build

.gitignore

@@ -9,7 +9,6 @@ stk-editor/
 .config/
 supertuxkart-64
 make*.bat
-__pycache__
 
 data/editor
 data/karts

.travis.yml

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

CHANGELOG.md

@@ -1,19 +1,4 @@
-## SuperTuxKart 0.9.2
-* Ghost replay races by Benau
-* Battle mode AI by Benau
-* Soccer mode AI by Benau
-* New icy soccer field by samuncle and Benau
-* New subsea track by samuncle
-* New volcano track by Ponzino
-* TTF font rendering by Benau
-* Kart properties refactor by Flakebi
-* Scripting work under the hood
-* Work on the track editor by mhp
-* Tweak to challenges
-* New farm track song by 0zone0ne and Krobonil
-* Bugfixes
-
-## SuperTuxKart 0.9.1
+## SupertTuxKart 0.9.1
 * Many bug fixes
 * Started to use scripting in tracks
 * Significant audio performance improvements

CMakeLists.txt

@@ -1,6 +1,6 @@
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.9.2")
+set(PROJECT_VERSION "0.8.1")
 
 cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
@@ -15,6 +15,7 @@ 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)
@@ -31,9 +32,7 @@ else()
 endif()
 
 if(MINGW OR CYGWIN)
-    option(USE_WIIUSE "Support for wiimote input devices" OFF)
-else()
-    option(USE_WIIUSE "Support for wiimote input devices" ON)
+    set(USE_WIIUSE OFF)
 endif()
 
 if(UNIX AND NOT APPLE)
@@ -68,7 +67,6 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
 
 # Build glew library
-add_definitions(-DGLEW_NO_GLU)
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
 include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
 
@@ -118,8 +116,8 @@ endif()
 include_directories(${STK_SOURCE_DIR})
 
 if(APPLE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
 elseif(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")   # Enable multi-processor compilation (faster)
 endif()
@@ -216,7 +214,7 @@ endif()
 # Set some compiler options
 if(UNIX OR MINGW)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()
 
 if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
@@ -259,7 +257,7 @@ endif()
 add_definitions(-DHAVE_OGGVORBIS)
 
 if(WIN32)
-    configure_file("${STK_SOURCE_DIR}/../tools/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
+    configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
 endif()
 
 # Provides list of source and header files (STK_SOURCES and STK_HEADERS)
@@ -366,17 +364,12 @@ if(UNIX AND NOT APPLE)
     endif()
 endif()
 
-# FreeBSD does not search in /usr/local/lib, but at least Freetype is installed there :(
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
-endif()
-
 if(APPLE)
     # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
     # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
     # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
     # CMake pick the library it wants essentially means I can't build.
-    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch x86_64 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
+    set_target_properties(supertuxkart PROPERTIES LINK_FLAGS "-arch i386 -F/Library/Frameworks -framework OpenAL -framework Ogg -framework Vorbis")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/Library/Frameworks/OpenAL.framework/Versions/A/Headers")
 endif()
 

INSTALL.md

@@ -1,7 +1,6 @@
 # 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`
 
@@ -17,7 +16,6 @@ First, make sure that you have the following packages installed:
   * OpenAL (recommended: openal-soft-devel)
   * Ogg    (libogg-dev)
   * Vorbis (libvorbis-dev)
-  * Freetype (libfreetype6-dev)
   * libcurl (libcurl-devel)
   * libbluetooth (bluez-devel)
   * libpng (libpng-devel)
@@ -27,10 +25,8 @@ First, make sure that you have the following packages installed:
 Ubuntu command:
 
 ```
-sudo apt-get install build-essential cmake libbluetooth-dev \
-libcurl4-gnutls-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev \
-libjpeg-dev libogg-dev libopenal-dev libpng-dev libvorbis-dev libxrandr-dev \
-mesa-common-dev pkg-config zlib1g-dev
+sudo apt-get install autoconf automake build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev \
+libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev libxrandr-dev
 ```
   
 Unpack the files from the tarball like this:

README.md

@@ -41,6 +41,8 @@ this has been done (check with the forum for details).
 ### Mac OS X
 The latest information about compilation on Mac are on our wiki:
 <http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX>
+The Xcode project file is in `/src/ide/Xcode/`, but it still 
+requires that all dependencies are installed as explained on the wiki.
 
 ### UNIX
 See [`INSTALL.md`](INSTALL.md) for details.

data/SuperTuxKart-Info.plist

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

data/challenges/jungle.challenge

@@ -2,7 +2,7 @@
 <challenge version="2">
     <track id="cocoa_temple" laps="3"/>
     <mode major="single" minor="quickrace"/>
-    <requirements trophies="5"/>
+    <requirements trophies="15"/>
     
     <hard>
         <karts number="5"/>

data/challenges/subsea.challenge

@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="abyss" laps="3"/>
+    <track id="subsea" laps="2"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="0"/>
     
     <hard>
         <karts number="5"/>
-        <requirements position="1" time="160"/>
+        <requirements position="1" time="205"/>
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="185"/>
+        <requirements time="225"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="270"/>
+        <requirements time="290"/>
     </easy>
 </challenge>

data/challenges/volcano_island.challenge

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

data/grandprix/1_penguinplayground.grandprix

@@ -4,7 +4,7 @@
     <track id="sandtrack"    laps="3" reverse="false" />
     <track id="farm"         laps="3" reverse="false" />
     <track id="olivermath"   laps="4" reverse="false" />
-    <track id="abyss"        laps="3" reverse="false" />
+    <track id="subsea"       laps="2" reverse="false" />
     <track id="scotland"     laps="3" reverse="false" /> 
  
 </supertuxkart_grand_prix>

data/grandprix/3_tothemoonandback.grandprix

@@ -5,7 +5,7 @@
     <track id="greenvalley"          laps="2" reverse="false" />
     <track id="mansion"              laps="3" reverse="false" />
     <track id="stk_enterprise"       laps="3" reverse="false" />
-    <track id="volcano_island"       laps="2" reverse="false" />
+    <track id="city"                 laps="2" reverse="false" />
     
 </supertuxkart_grand_prix>
 

data/graphical_restrictions.xml

@@ -4,24 +4,19 @@
   <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="<11.2"    disable="ComputeShader"/>
-  <card contains="Intel"          os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Intel"          os="linux"    version="<16.0"    disable="FramebufferSRGBCapable"/>
-  <card contains="Intel"          os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
-  <card contains="Intel"          os="windows"                     disable="TextureCompressionS3TC"/>
-  <card contains="Intel"          os="osx"                         disable="TextureCompressionS3TC"/>
+  <card contains="Intel"                                           disable="TextureCompressionS3TC"/>
   <card contains="Intel"          os="windows"                     disable="HighDefinitionTextures"/>
   <card contains="NVIDIA"         os="windows"  version="<344.65"  disable="BufferStorage"/>
   <card contains="NVIDIA"         os="linux"    version="<343.22"  disable="BufferStorage"/>
   <card contains="NVIDIA"                                          disable="ShaderAtomicCounters"/>
   <card contains="Mesa"           os="linux"    version="<10.3"    disable="BufferStorage"/>
   <card contains="Mesa"           os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
-  <card contains="Mesa"           os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Mesa"           os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
+  <card contains="Mesa"           os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Mesa"           os="linux"                       disable="TextureCompressionS3TC"/>
   <card contains="Gallium"        os="linux"    version="<10.3"    disable="BufferStorage"/>
   <card contains="Gallium"        os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
-  <card contains="Gallium"        os="linux"    version="<11.2"    disable="GeometryShader"/>
-  <card contains="Gallium"        os="linux"    version="<11.2"    disable="TextureCompressionS3TC"/>
+  <card contains="Gallium"        os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Gallium"        os="linux"                       disable="TextureCompressionS3TC"/>
   <!-- On osx radeon appears to have different version numbers, e.g.
        1.32.20 -->
   <card contains="Radeon"         os="linux"    version="<14.300"  disable="DriverRecentEnough"/>

data/gui/ghost_replay_info_dialog.stkgui

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

data/gui/ghost_replay_selection.stkgui

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

data/gui/grand_prix_lose.stkgui

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer proportion="1"/>
-        <button id="save"     width="450" align="center" text="Save Grand Prix"/>
-        <spacer height="20"/>
-        <button id="continue" width="450" align="center" text="Continue"/>
+    <div 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,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <spacer proportion="1"/>
-        <button id="save"     width="450" align="center" text="Save Grand Prix"/>
-        <spacer height="20"/>
-        <button id="continue" width="450" align="center" text="Continue"/>
+    <div 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/online/create_server.stkgui

@@ -17,42 +17,6 @@
                         <label proportion="1" text_align="left" I18N="In the server creation screen" text="Max. number of players"/>
                         <gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
                     </div>
-                    
-                    <spacer height="20" width="20"/>
-
-                    <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the server creation screen" text="Password (optional)"/>
-                        <textbox proportion="1" id="password" I18N="In the server creation screen"/>
-                    </div>
-                    
-                    <spacer height="20" width="20"/>
-                    
-                    <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Difficulty"/>
-                        <!--<gauge id="difficulty" proportion="1" min_value="1" max_value="4"/>-->
-                    <ribbon id="difficulty" height="135" width="90%" align="center">
-                        <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
-                                I18N="Difficulty" text="Novice"/>
-                        <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
-                                I18N="Difficulty" text="Intermediate"/>
-                        <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
-                                I18N="Difficulty"  text="Expert"/>
-                        <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
-                                I18N="Difficulty"  text="SuperTux"/>
-                    </ribbon>
-                    
-                    <spacer height="20" width="20"/>
-                    
-                    <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Game mode"/>
-                    <ribbon id="gamemode" height="135" width="50%" align="center">
-                        <icon-button id="normal" width="128" height="128" icon="gui/mode_normal.png"
-                                I18N="Multiplayer game mode" text="Normal Race"/>
-                        <icon-button id="timetrial" width="128" height="128" icon="gui/mode_tt.png"
-                                I18N="Multiplayer game mode" text="Time Trial"/>
-                    </ribbon>
-                    <!--
-                    <scrollable_toolbar id="gamemode" height="135" width="90%" label_location="bottom" align="center"
-                            child_width="135" child_height="135" />
-                    -->
                 </div>
 
                 <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>

data/gui/online/networking_lobby.stkgui

@@ -10,14 +10,6 @@
                         <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name:"/>
                         <label proportion="2" text_align="left" id="server_name" text=""/>
                     </div>
-                    <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Difficulty:"/>
-                        <label proportion="2" text_align="left" id="server_difficulty" text=""/>
-                    </div>
-                    <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Game mode:"/>
-                        <label proportion="2" text_align="left" id="server_game_mode" text=""/>
-                    </div>
                 </box>
                 <spacer width="20" height="20"/>
                 <box proportion="1" height="100%" layout="vertical-row">
@@ -33,11 +25,7 @@
                 </box>
                 <spacer width="20" height="20"/>
                 <box id="actions" proportion="1" height="100%" layout="vertical-row">
-<!--                    <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
--->
-                  <icon-button id="start" width="64" height="64" icon="gui/green_check.png" align="center"
-                      I18N="In the network lobby" text="Start Race"/>
-
+                    <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
                 </box>
             </div>
         </div>

data/gui/online/online_screen.stkgui

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="0" y="0" width="100%" height="fit" layout="vertical-row">
+        <button id="user-id" width="20%" height="fit" align="right"/>
+    </div>
+    
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
+
+        <header text_align="center" width="80%" align="center" I18N="In the online multiplayer screen" text="Online Multiplayer"/>
+
+        <spacer height="5%" width="25"/>
+        <box width="100%" height="38%" padding="10" layout="vertical-row">
+            <bright width="100%" text="Local Networking" align="center" text_align="left" />
+
+            <buttonbar  id="lan" proportion="2" width="90%" align="center">
+                <icon-button id="find_lan_server" width="128" height="128"
+                             icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Find Server"/>
+                <icon-button id="create_lan_server" width="128" height="128"
+                             icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Create Server"/>
+                <icon-button id="manage_user" width="128" height="128"
+                             icon="gui/options_players.png"
+                             I18N="In the online multiplayer screen" text="Users"/>
+            </buttonbar>
+        </box>
+
+        <spacer height="5%" width="25"/>
+
+        <box width="100%" height="38%" padding="10" layout="vertical-row">
+            <bright width="100%" text="Global Networking" align="center" text_align="left" />
+
+            <buttonbar id="menu_top_row" proportion="2" width="90%" align="center">
+                <icon-button id="find_wan_server" width="128" height="128"
+                             icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Find Server"/>
+                <icon-button id="create_wan_server" width="128" height="128"
+                             icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                             I18N="In the online multiplayer screen" text="Create Server"/>
+                <icon-button id="quick_wan_play" width="128" height="128"
+                             icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
+                             I18N="In the online multiplayer screen" text="Quick Play"/>
+            </buttonbar>
+        </box>
+
+        <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
+            <label text_align="left" align="center" height="100%" id="online_status" proportion="1" text=""/>
+
+            <spacer width="10" height="10" />
+
+            <buttonbar id="menu_bottomrow" x="0" y="0" width="12%" height="100%" align="center">
+                <icon-button id="profile" width="64" height="64" icon="gui/green_check.png"  extend_label="50"
+                             I18N="In the online multiplayer screen" text="Profile" label_location="hover"/>
+                <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
+                             I18N="In the online multiplayer screen" text="Log Out" label_location="hover"/>
+            </buttonbar>
+
+        </bottombar>
+
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+</stkgui>

data/gui/online/profile_achievements_tab.stkgui

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

data/gui/online/profile_friends.stkgui

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

data/gui/online/profile_servers.stkgui

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

data/gui/online/profile_settings.stkgui

@@ -8,7 +8,6 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <!--<icon-button id="tab_servers" width="128" height="128" icon="gui/main_network.png"/>-->
             <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
             <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
             <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"

data/gui/online/server_info_dialog.stkgui

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

data/gui/online/waiting_for_others.stkgui

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

data/gui/soccer_setup.stkgui

@@ -6,39 +6,38 @@
 
         <header width="80%" text="Race Setup" align="center" text_align="center" />
 
-        <spacer height="10" width="25"/>
+        <spacer height="25" width="25"/>
 
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
                     I18N="In soccer setup screen" text="Number of goals to win" text_align="left" />
-            <spacer width="10" height="25"/>
+            <spacer width="50" height="25"/>
             <spinner id="goalamount" width="200" height="90%" min_value="1" max_value="10"/>
         </div>
 
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
                     I18N="In soccer setup screen" text="Maximum time (min.)" text_align="left" />
-            <spacer width="10" height ="25"/>
+            <spacer width="50" height ="25"/>
             <spinner id="timeamount" width="200" height="90%" min_value="1" max_value="15"/>
         </div>
 
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
                     I18N="In soccer setup screen" text="Game type (Goals limit / Time limit)" text_align="left" />
-            <spacer width="10" height="25"/>
+            <spacer width="50" height="25"/>
             <checkbox id="time_enabled"/>
         </div>
 
-        <spacer height="10" width="25"/>
+        <spacer height="40" width="25"/>
 
-        <bubble height="fit" width="100%" id="lblLeftRight" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" word_wrap="true" text_align="center"/>
+        <bright height="15" width="25" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" text_align="center" align="center" />
 
         <div id="central_div" layout="horizontal-row" width="100%" proportion="1" align="center">
-            <roundedbox y="5%" width="100%" layout="horizontal-row" height="95%">
+            <roundedbox y="5%" width="100%" layout="horizontal-row" height="100%">
                 <!-- Content is added programmatically -->
             </roundedbox>
-            <icon id="red_team" I18N="In soccer setup screen" text="Red Team" icon="gui/soccer_ball_red.png" width="font" height="font"/>  <!-- Layout is done programmatically -->
-            <icon id="blue_team" I18N="In soccer setup screen" text="Blue Team" icon="gui/soccer_ball_blue.png" width="font" height="font"/>
+            <header id="vs" text="VS"/>     <!-- Layout is done programmatically -->
         </div>
 
         <button id="continue" I18N="In soccer setup screen" text="Continue" align="center" width="60%"/>

data/gui/track_info.stkgui

@@ -3,9 +3,9 @@
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
     <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-        <header id="name" height="7%" width="80%" align="center" text_align="center"/>
+        <header id="name" height="5%" width="80%" align="center" text_align="center"/>
 
-        <spacer width="1" height="1%"/>
+        <spacer width="1" height="5%"/>
 
         <box width="100%" height="40%" padding="10" layout="horizontal-row">
             <!-- Left pane -->
@@ -40,17 +40,14 @@
                     <label id="highscore3" proportion="1" text="(Empty)"/>
                 </div>
 
-                <spacer width="1" height="2%"/>
+                <spacer width="1" height="10%"/>
 
                 <label id="author" width="100%" text_align="center" word_wrap="true"/>
-
-                <spacer width="1" height="10%"/>
-                <label id="max-arena-players" width="100%" text_align="center" word_wrap="true"/>
             </div>
 
         </box>
-        <spacer width="1" height="1%"/>
-        <box width="100%" height="33%" padding="15" layout="vertical-row">
+        <spacer width="1" height="5%"/>
+        <box width="100%" height="25%" padding="15" layout="vertical-row">
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label id="lap-text" proportion="1" I18N="In the track info screen" text="Number of laps" text_align="right"/>
                 <spacer width="40"/>
@@ -70,26 +67,17 @@
             </div>
             <spacer height="10"/>
             <div width="100%" height="fit" layout="horizontal-row" >
-                <label id="option-text" proportion="1" I18N="In the track info screen" text_align="right"/>
+                <label id="reverse-text" proportion="1" I18N="In the track info screen" text="Drive in reverse" text_align="right"/>
                 <spacer width="40"/>
                 <div proportion="1" height="fit" layout="horizontal-row">
                     <div width="50%" height="fit" text-align="center" layout="vertical-row" >
-                        <checkbox id="option" align="center"/>
+                        <checkbox id="reverse" align="center"/>
                     </div>
                 </div>
             </div>
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label id="record-race-text" proportion="1" I18N="In the track info screen" text="Record the race for ghost replay" text_align="right"/>
-                <spacer width="40"/>
-                <div proportion="1" height="fit" layout="horizontal-row">
-                    <div width="50%" height="fit" text-align="center" layout="vertical-row" >
-                        <checkbox id="record" align="center"/>
-                    </div>
-                </div>
-            </div>
-            <spacer width="1" height="1%"/>
+            <spacer width="1" height="2%"/>
         </box>
-        <spacer width="1" height="1%"/>
+        <spacer width="1" height="5%"/>
         <buttonbar id="buttons" height="15%" width="100%" align="center">
             <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
                     I18N="In the track info screen" text="Start Race"/>

data/gui/tracks.stkgui

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

data/gui/tracks_and_gp.stkgui

@@ -1,30 +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="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
-
-        <header width="80%" I18N="In the track and grand prix selection screen" text="Grand Prix"
-                align="center" text_align="center" />
-
-        <box width="100%" height="195" padding="0">
-            <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
-                                square_items="true" child_width="175" child_height="120" />
-        </box>
-
-        <header width="100%" I18N="In the track and grand prix selection screen" text="All Tracks"
-                align="center" text_align="center" />
-
-        <box proportion="1" width="100%" layout="vertical-row" padding="1">
-            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
-                label_location="bottom" align="center" max_rows="4"
-                child_width="160" child_height="120" />
-            <spacer width="20" height="13" />
-        </box>
-
-        <!-- Populated dynamically at runtime -->
-        <tabs width="100%" height="25" id="trackgroups"> </tabs>
-
-        <spacer width="100%" height="2%" />
-    </div>
-</stkgui>

data/gui/user_screen.stkgui

@@ -13,7 +13,7 @@
                                square_items="true" child_width="128" child_height="128" />
 
             <spacer height="15" width="10"/>
-            <div width="90%" align="center" layout="vertical-row" proportion="1">
+            <div width="90%" align="center" layout="vertical-row" height="fit">
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
@@ -44,29 +44,23 @@
                            I18N="In the user screen" text="Password"/>
                     <textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
-                
-                <spacer height="20" width="20"/>
-                
-                <label id="message" width="100%" text_align="center"/>
             </div>
-            
-			<spacer width="20" proportion="1"/>
-			
-			<div width="90%" align="center" layout="vertical-row" height="fit">
-				<buttonbar id="options" width="100%" height="80" align="center">
-					<icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
-								 I18N="In the user screen" text="OK" label_location="bottom"/>
-					<icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
-								 I18N="In the user screen" text="Add user" label_location="bottom"/>
-					<icon-button id="delete" width="64" height="64" icon="gui/remove.png"
-								 I18N="In the user screen" text="Delete" label_location="bottom"/>
-					<icon-button id="rename" width="64" height="64" icon="gui/rename.png"
-								 I18N="In the user screen" text="Rename" label_location="bottom"/>
-					<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
-				</buttonbar>
-			</div>
-			<spacer width="20" height="25"/>
+            <div width="80%" align="center" layout="vertical-row" height="fit">
+                <label id="message" width="80%" align="center" text_align="left"/>
+            </div>
+            <spacer width="20" height="25"/>
+            <buttonbar id="options" width="90%" height="13%" align="bottom">
+                <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
+                             I18N="In the user screen" text="OK" label_location="bottom"/>
+                <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
+                             I18N="In the user screen" text="Add user" label_location="bottom"/>
+                <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
+                             I18N="In the user screen" text="Delete" label_location="bottom"/>
+                <icon-button id="rename" width="64" height="64" icon="gui/rename.png"
+                             I18N="In the user screen" text="Rename" label_location="bottom"/>
+                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                             I18N="In the user screen" text="Cancel" label_location="bottom"/>
+            </buttonbar>
         </box>
         <spacer width="20" height="15"/>
     </div>

data/kart_characteristics.xml

@@ -1,404 +0,0 @@
-<?xml version="1.0"?>
-<!-- Format
-    It is possible to give relative values (factors and more) for each property.
-
-    The format as a regex is: ([+-*/](%d+|x))*
-    An empty value means no change, a value without sign or with a '-' replaces
-    the previous value. If an operator prefixes the string, e.g. *1.5 (- doesn't
-    work because it's a sign). x will get replaced by the previous value which
-    means *1.5 is equal to x*1.5. It's also possible to combine operations:
-    +1.5*20 means "add 1.5 to the previous value and then multiply by 20".
-    Note that it's computed sequentially from left to right and there is no
-    operator precedence. Also whitespaces aren't allowed because they are used
-    to split arrays.
-    If you want to return the square of something use x*x or only *x.
-
-    ATTENTION: '-' is a special case if it is the first character of a number-
-    string. It means that the number is negative and NOT that the following
-    float will be substracted from the base value. So if x = 10 and the string
-    "-5" is processed, the result will be -5 and not the same as "x-5", which
-    would result in 10 - 5 = 5.
--->
-<characteristics>
-    <!-- The default values that can be modified by the difficulty, karts, etc.
-        The values here should also be the values of the maximum difficulty. -->
-    <characteristic name="base">
-        <!-- ********** Physics ********** -->
-
-        <!-- Suspension
-            stiffness: kart's suspension stiffness.
-            rest: Length of suspension when at rest.
-            travel-cm: maximum movement of suspension - in cm!!
-            exp-string-response: dampen the suspension spring reaction
-                exponentially. See
-                http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=7369\&p=25236&hilit=vehicle#p25236
-                for details.
-            max-force: Maximum suspension force -->
-        <suspension stiffness="140" rest="0.3" travel="0.29"
-            exp-spring-response="false" max-force="12000" />
-
-        <!-- Values related to stability of the chassis: damping, and reduced
-                impact of roll.
-            downward-impulse-factor: A speed proportional impulse applied each
-                frame that pushes the vehicle onto the ground.
-            track-connection-accel: An artificial force that pulls a wheel to
-                the ground if its off ground. Reduces the affect if a kart loses
-                contact with the ground (i.e. it then can't steer or accelerate
-                anymore).
-            smooth-flying-impulse: apply a torque impulse to flying kart to keep
-                them parallel to the ground. -->
-        <stability roll-influence="0.3"
-                   chassis-linear-damping="0.2"
-                   chassis-angular-damping="0"
-                   downward-impulse-factor="5"
-                   track-connection-accel="2"
-                   smooth-flying-impulse="250" />
-
-        <!-- Turning
-            radius: The turn radius of the kart at
-                a given speed. The actual steering angle is dependent on the
-                wheel base of the kart: radius = wheel_base/sin(steering_angle).
-                The values below define that at speed 0 the turn radius is 2, at
-                speed 10 the radius is 7.5 etc.
-                The actual turn radius is piece-wise linearly interpolated. This
-                allows for tighter turning at lower speeds, and also avoids that
-                the kart becomes too hard to control at high speed (speeds of
-                higher than 23 can only be reached with powerups).
-            time-full-steer: This is the amount of change in steering depending
-                on current steering. So if the steering is between 0 and 0.5,
-                the time-for-steering-change is 0.15. If the current steering is
-                between 0.5 and 1.0, the time-for-steering-change is 0.25.
-                The speed is used as dt/time-for-steering-change.
-                In short: steering at less than halfway is somewhat faster,
-                which should avoid oversteering (by pressing the key for too long),
-                but slower when you want to steer more. Overwall with the current
-                settings the expected time-to-full-steer is:
-                0.5 * 0.25 + 0.5 * 0.15 = 0.2 ... which is overall the same
-                time we had previously. -->
-        <turn radius="0:2.0 10:7.5 25:15 45:30"
-              time-full-steer="0:0.17 0.5:0.17 0.5:0.28 1.0:0.28"
-              time-reset-steer="0.1" />
-
-        <!-- Speed and acceleration
-            power: The power of the kart
-            max-speed: The base maximum speed of the kart in m/s
-            brake-factor: Value used when braking.
-            brake-time-increase: The brake force is multiplied by
-                (1 + brake_time) * brake_time_increase - i.e. the longer the
-                brake was pressed, the harder the kart will brake.
-            max-speed-reverse-ratio is the percentage of max speed for reverse
-                gear.
-          -->
-        <engine power="875" max-speed="25" brake-factor="15"
-                brake-time-increase="6" max-speed-reverse-ratio="0.65" />
-
-        <!-- Simulated gears
-            switch-ratio defines at what ratio of the maximum
-                speed what gear is selected, e.g. 0.25 means that if the speed is
-                bigger or equal to 0.25 * maxSpeed then use gear 1, 0.5 means if
-                the speed is bigger or equal to 0.5 x maxSpeed then gear 2.
-                gear-power-increase contains the increase in max power (to simulate
-                different gears), e.g. 2.5 as first entry means: 2.5 * maxPower in gear 1
-                | first  | second |  third | . -->
-        <gear switch-ratio="0.25 0.7 1.0" power-increase="2.2 1.7 1.3" />
-
-        <!-- Mass of a kart -->
-        <mass value="350" />
-
-        <!-- Wheels
-            damping-relaxation/compression: for bullet
-            damping parameters
-            Radius and width of wheel
-            front-right, front-left, rear-right and rear-left give the
-                position of the physics raycast wheels relative to the center of
-                gravity. Default is to use the corners of the chassis to attach
-                the wheels to. -->
-        <wheels damping-relaxation="35"  damping-compression="5">
-            <front-right position="0.38 0 0.6"   />
-            <front-left  position="-0.38 0 0.6"  />
-            <rear-right  position="0.38 0 -0.6"  />
-            <rear-left   position="-0.38 0 -0.6" />
-        </wheels>
-
-
-        <!-- ********** Visuals ********** -->
-
-        <!-- Skidding
-            increase: multiplicative increase of skidding factor in each frame.
-            decrease: multiplicative decrease of skidding factor in each frame.
-            max: maximum skidding factor = maximum increase of steering angle.
-            time-till-max: Time till maximum skidding is reached.
-            visual: Additional graphical rotation of kart. The graphical rotation
-                of the kart also determines the direction the kart is driving to
-                when skidding is stopped.
-            visual-time: How long it takes for the visual skid to reach maximum.
-            revert-visual-time: how long it takes when stopping a skid to revert
-                the visual skid and bring visuals and physics in sync again.
-            angular-velocity: Angular velocity to be used for the kart when skidding.
-            min-speed: Minimum speed a kart must have before it can skid. Must be
-                >0, otherwise the kart can skid at the start of the race.
-            time-till-bonus: How long a kart needs to skid in order to get a bonus.
-            bonus-force: A speedup applied to the kart whick skidded for a while.
-            bonus-time: How long the bonus-force is applied.
-            bonus-force: Additional engine force (this is used to offset the fact
-                that turning after skidding (e.g. to correct direction) often uses
-                up the skid bonus).
-            post-skid-rotate-factor: a factor to be used to determine how much
-                the chassis of a kart should rotate to match the graphical view.
-                A factor of 1 is identical, a smaller factor will rotate the kart
-                less (which might  feel better).
-            physical-jump-time: Time for a physical jump at the beginning of a skid.
-                graphical-jump-time: Time for a graphics-only jump at the beginning
-                of a skid.
-            reduce-turn-min/max: The steering done by the controller (which is in
-                [-1,1]) is mapped to [reduce-turn-min, reduce-turn-max] when skidding
-                is active (for left turn, right turn will use [-max, -min]). The
-                effect is that while you skid (say left) you can adjust the direction
-                of the turn the kart is doing somewhat by steering to the left and right,
-                but you will always keep on doing a left turn, just more or less. -->
-        <skid increase="1.05" decrease="0.95" max="2.5" time-till-max="0.5"
-              visual="1.25" visual-time="0.7" revert-visual-time="0.7"
-              min-speed="10"  time-till-bonus="1.0 3.0"
-              bonus-speed="4.5 6.5" bonus-time="3.0 4.0"
-              bonus-force="250 350"
-              physical-jump-time="0" graphical-jump-time="0.4"
-              post-skid-rotate-factor="1"
-              reduce-turn-min="0.2" reduce-turn-max="0.8" enabled="true" />
-
-        <!-- Camera
-            Distance between kart and camera.
-            forward-up-angle: Angle between camera and plane of kart (pitch)
-                when the camera is pointing forward
-            backward-up-angle: Angle between camera and plane of kart (pitch)
-                when the camera is pointing backwards. This is usually
-                larger than the forward-up-angle, since the kart itself
-                otherwise obstricts too much of the view. -->
-        <camera distance="1.0" forward-up-angle="15"
-                backward-up-angle="5" />
-
-        <!-- Jump animation
-            animation-time: only if the estimated time for a jump is larger
-                than this value will the jump animation being
-                shown. -->
-       <jump animation-time="0.5" />
-
-        <!-- Leaning related parameters, i.e. slightly leaning the karts when
-             driving a fast curve.
-            max: maximum leaning (i.e. when steering as much as possible at highest
-                speed), in degrees.
-            speed: Speed with which the leaning changes (in degree/second). -->
-        <lean max="6.6" speed="15.0" />
-
-
-        <!-- ********** Items ********** -->
-
-        <!-- Anvil
-            weight: The additional weight an anvil adds to a kart.
-            speed-factor: The additional slowdown caused by the anvil.
-            duration: The time an anvil is active. -->
-        <anvil duration="2.0" weight="150"  speed-factor="0.2" />
-
-        <!-- Parachute
-            friction: The friction increase when a parachute is attached.
-            duration: The time an attached parachute is active
-            duration-other: The time a parachute attached from other kart works
-            lbound-fraction: The lower bound fraction of speed when lost will
-                detach parachute. E.g. at nearly 0 speed, only 5% of speed
-                need to be lost.
-            ubound-fraction: The upper bound fraction of speed when lost will
-                detach parachute. E.g. at max-speed 30% of speed must be lost.
-            max-speed: A factor that decides the impact of rate of speed
-                (distance between bounds) -->
-        <parachute friction="2.0" duration="4.0" duration-other="8.0"
-                   lbound-fraction="0.95" ubound-fraction="0.7" max-speed="23" />
-
-        <!-- Bubblegum
-            duration: How long the bubblegum lasts.
-            speed-fraction: To what fraction of top-speed the speed is reduced.
-            torque: To rotate the kart somewhat.
-            fade-in-time: How quick the slowdown takes effect.
-            shield-duration: How long the bubblegum shield lasts -->
-        <bubblegum duration="1" speed-fraction="0.3" torque="500" fade-in-time="0.01"
-                   shield-duration="10.0" />
-
-        <!-- Zipper
-            duration: Time a zipper is active.
-            force: Additional zipper force.
-            speed-gain: One time additional speed.
-            max-speed-increase: Additional speed allowed on top of the
-                kart-specific maximum kart speed.
-            fade-out-time: determines how long it takes for a zipper
-                to fade out (after 'time'). -->
-        <zipper duration="3.5" force="250.0" speed-gain="4.5" max-speed-increase="15"
-                fade-out-time="1.0" />
-
-        <!-- Swatter
-            duration: How long can the swatter be active.
-            distance: How close a kart or an item must be before it can be hit.
-                      This is the square of the real distance to accelerate the
-                      compution.
-            squash-duration: How long a kart will remain squashed.
-            squash-slowdown: Percentage of max speed that a kart is
-                restricted to. -->
-        <swatter duration="10" distance="9" squash-duration="5"
-                 squash-slowdown="0.5" />
-
-        <!-- Plunger and rubber band handling
-            band-max-length: The maximum length of rubber band before it snaps.
-            band-force: The force a plunger/rubber band applies to the kart(s).
-            band-duration: The duration a rubber band acts.
-            in-face-time determines how long it takes before a plunger
-                in your face is removed. -->
-        <plunger band-max-length="50" band-force="1500" band-duration="1"
-                 band-speed-increase="7" band-fade-out-time="3"
-                 in-face-time="4.5" />
-
-
-        <!-- ********** Miscellaneous ********** -->
-
-        <!-- Startup
-            If a kart starts within the specified time after 'go',
-            it receives the corresponding bonus from 'boost'. Those
-            fields must have the same size, and must be sorted by
-            increasing times. -->
-        <startup time="0.3 0.5"
-                 boost="6 3" />
-
-        <!-- Rescue
-            duration: How long it takes the kart to be raised.
-            height: how height the kart will be raised before it is
-                dropped back onto the track.
-            vert rescue offset: used to raise karts a bit higher before
-                releasing them on the ground after a rescue. Used to avoid
-                resetting karts into the track. Not sure if this is still
-                necessary. -->
-        <rescue vert-offset="0.0" duration="1.2" height="2" />
-
-        <!-- Explosion
-            duration: how long it takes before the kart can drive again (this
-                determines how height the kart is being thrown).
-            invulnerability-time: how long a kart will be invulnerable
-                after being hit by an explosion.
-            radius: Kart closer to this value will be affected by
-                an explosion as well.  -->
-        <explosion duration="2" radius="5"
-                   invulnerability-time="6" />
-
-        <!-- Nitro
-            engine-force: additional engine power
-            consumption: nitro consumption - heavier characters can be set
-                to need more nitro than lighter character.
-            small-container: how much energy a small container gives.
-            big-container: how much energy a big container gives.
-            max-speed-increase: How much the speed of a kart might exceed
-                its maximum speed (in m/s).
-            duration: How long the increased speed will be valid after
-                the kart stops using nitro (and the fade-out-time starts).
-            fade-out-time: Duration during which the increased maximum
-                speed due to nitro fades out.
-            max: How much nitro a kart can store. -->
-        <nitro engine-force="600" consumption="1" small-container="1" big-container="3"
-               max-speed-increase="5" duration="1" fade-out-time="2" max="20" />
-
-        <!-- Slipstream
-            length: How far behind a kart slipstream works
-            width: how wide slipstream works furthest away from the kart.
-            collect-time: How many seconds of sstream give  maximum benefit
-            use-time: How long the benefit will last.
-            add-power: Additional power due to sstreaming. 1 = +100%
-            min-speed: Minimum speed necessary for slipstream to take effect.
-            max-speed-increase: How much the speed of the kart might exceed
-                its normal maximum speed.
-            duration: How long the higher speed lasts after slipstream stopped
-                working.
-            fade-out-time: How long the slip stream speed increase will
-                gradually be reduced.  -->
-        <slipstream length="10" width="2" collect-time="2" use-time="5"
-                    add-power="3" min-speed="10" max-speed-increase="5"
-                    duration="1" fade-out-time="2" />
-    </characteristic>
-
-    <!-- The different difficulties (like easy, medium, hard) -->
-    <difficulties>
-        <characteristic name="easy">
-            <engine power="*0.66" max-speed="*0.6" />
-            <plunger in-face-time="3" />
-        </characteristic>
-        <characteristic name="medium">
-            <engine power="*0.77" max-speed="*0.8" />
-            <plunger in-face-time="4" />
-        </characteristic>
-        <characteristic name="hard">
-            <engine power="*0.89" max-speed="*0.92" />
-        </characteristic>
-        <!-- This doesn't need to be changed because the most fast/heavy/extreme
-            values should also be the default ones. -->
-        <characteristic name="best" />
-    </difficulties>
-
-    <!-- The different kart types, that can be specified in the kart.xml file -->
-    <kart-types>
-        <characteristic name="light">
-            <engine power="*0.46" max-speed="*0.92" brake-factor="*1"
-                 max-speed-reverse-ratio="*0.77" />
-            <gear switch-ratio="0.20 0.55 1" power-increase="5 4 3" />
-            <mass value="*0.56" />
-            <startup time="0.3 0.5"
-                     boost="8.5 4.5" />
-            <explosion time="2.1" radius="5.5"
-                       invulnerability-time="7" />
-            <nitro engine-force="350" max-speed-increase="4.5" duration="1.5"
-                   fade-out-time="2.5" />
-            <slipstream length="11" collect-time="1.5" use-time="2.5" add-power="3.2"
-                        min-speed="9" max-speed-increase="4" duration="1.2"
-                        fade-out-time="2.3" />
-        </characteristic>
-        <characteristic name="medium">
-            <engine power="*0.63" max-speed="*1" brake-factor="*0.73"
-                    max-speed-reverse-ratio="*0.62" />
-            <gear switch-ratio="0.30 0.7 1.0" power-increase="2.2 2.2 2.5" />
-            <mass value="*0.71" />
-            <startup time="0.3 0.5"
-                     boost="4.2 2.6" />
-            <explosion time="1.8" radius="5"
-                       invulnerability-time="6" />
-            <nitro engine-force="425" consumption="1.4" duration="1" />
-            <slipstream use-time="3.3" add-power="2.8" duration="0.9"
-                        fade-out-time="1.6" />
-        </characteristic>
-        <characteristic name="heavy">
-            <engine power="*1" max-speed="*1" brake-factor="*0.66"
-                    max-speed-reverse-ratio="*1" />
-            <gear switch-ratio="0.45 0.70 1" power-increase="1.5 1.7 2.5" />
-            <mass value="*1" />
-            <swatter duration="10" distance="3" squash-duration="5"
-                     squash-slowdown="0.5" />
-            <startup time="0.3 0.5"
-                     boost="3.8 2" />
-            <explosion time="1.5" radius="4"
-                       invulnerability-time="6" />
-            <nitro engine-force="600" consumption="2" max-speed-increase="8"
-                   duration="0.7" fade-out-time="1.3" />
-            <slipstream length="8.5" use-time="4" add-power="2.7" min-speed="10.5"
-                   max-speed-increase="8" duration="0.7" fade-out-time="1" />
-        </characteristic>
-    </kart-types>
-
-    <!-- Per-player settings/handicaps (or boosts) -->
-    <player-characteristics>
-        <characteristic name="normal" />
-        <characteristic name="handicap">
-            <engine brake-factor="*0.8" brake-time-increase="*0.85" max-speed-reverse-ratio="*0.8" />
-            <bubblegum duration="*1.5" speed-fraction="*1.5" torque="*1.5" />
-            <zipper duration="*0.8" force="*0.8" speed-gain="*0.8" max-speed-increase="*0.8" />
-            <swatter duration="*0.8" squash-duration="*1.5" squash-slowdown="*1.8" />
-            <plunger band-max-length="*0.8" band-speed-increase="*0.8" in-face-time="*1.3" />
-            <startup time="*0.8 0.8" boost="*0.8 0.8" />
-            <rescue duration="*1.5" />
-            <explosion duration="*1.3" invulnerability-time="*0.7" />
-            <nitro engine-force="*0.8" consumption="*1.1" max-speed-increase="*0.9" max="*0.8" />
-            <slipstream length="*0.8" width="*0.8" collect-time="*1.5" use-time="*0.8"
-                add-power="*0.8" min-speed="*0.8" max-speed-increase="*0.9" duration="*0.8" />
-        </characteristic>
-    </player-characteristics>
-</characteristics>

data/localized_name.txt

@@ -1,231 +0,0 @@
-aa=ʿAfár af
-af=Afrikaans
-af_ZA=0
-am=ኣማርኛ
-ar=العربية
-ar_AR=0
-ar_OM=0
-ar_SA=0
-ar_SY=0
-ar_TN=0
-as=অসমীয়া
-ast=Asturianu
-ay=aymar aru
-az=Azərbaycanca
-az_IR=0
-be=Беларуская мова
-bg=български
-bg_BG=0
-bn=বাংলা
-bn_BD=0
-bn_IN=0
-bo=བོད་སྐད་
-br=brezhoneg
-bs=Bosanski
-bs_BA=0
-bs_BS=0
-ca_ES=0
-ca=0
-cmn=0
-co=corsu
-cs=Čeština
-cs_CZ=Čeština (Česká Republika)
-cy=Welsh
-cy_GB=Welsh (Great Britain)
-cz=Unknown language
-da=Dansk
-da_DK=Dansk (Danmark)
-de=Deutsch
-de_AT=Deutsch (Österreich)
-de_CH=Deutsch (Schweiz)
-de_DE=Deutsch (Deutschland)
-dk=Unknown language
-dz=རྫོང་ཁ
-el=ελληνικά
-el_GR=0
-en=English
-en_AU=English (Australia)
-en_CA=English (Canada)
-en_GB=English (Great Britain)
-en_US=English (United States)
-en_ZA=English (South Africa)
-en_US=English
-eo=Esperanto
-es=Español
-es_AR=0
-es_CL=0
-es_CO=0
-es_CR=0
-es_DO=0
-es_EC=0
-es_ES=0
-es_GT=0
-es_HN=0
-es_LA=0
-es_MX=0
-es_NI=0
-es_PA=0
-es_PE=0
-es_PR=0
-es_SV=0
-es_UY=0
-es_VE=0
-et=eesti keel
-et_EE=0
-et_ET=0
-eu=euskara
-eu_ES=0
-fa=فارسى
-fa_AF=0
-fa_IR=0
-fi=suomi
-fi_FI=0
-fo=Føroyskt
-fo_FO=0
-fr=Français
-fr_CA=Français (Canada)
-fr_CH=Français (Suisse)
-fr_FR=Français (France)
-fr_LU=Français (Luxembourg)
-fy=Frysk
-ga=Gaeilge
-gd=Gàidhlig
-gl=Galego
-gl_ES=0
-gn=Avañe'ẽ
-gu=ગુજરાતી
-gv=Gaelg
-ha=حَوْسَ
-he=עברית
-he_IL=0
-hi=हिन्दी
-hr=Hrvatski
-hr_HR=0
-hu=magyar
-hu_HU=0
-hy=Հայերեն
-ia=Interlingua
-id=Bahasa Indonesia
-id_ID=0
-is=Íslenska
-is_IS=0
-it=Italiano
-it_CH=0
-it_IT=0
-iu=ᐃᓄᒃᑎᑐᑦ/inuktitut
-ja=日本語
-ja_JP=0
-ka=ქართული
-kk=Қазақша
-kl=Kalaallisut
-km=ភាសាខ្មែរ
-km_KH=0
-kn=ಕನ್ನಡ
-ko=한국어
-ko_KR=0
-ku=Kurdî
-kw=Kernowek
-ky=кыргызча
-la=Latina
-lo=ລາວ
-lt=Lietuvių
-lt=0
-lv=Latviešu
-lv_LV=0
-jbo=La .lojban.
-mg=Malagasy
-mi=Māori
-mk=Македонски
-mk_MK=0
-ml=മലയാളം
-mn=Монгол
-mr=मराठी
-ms=Bahasa Melayu
-ms_MY=0
-mt=Malti
-my=မြန်မာဘာသာ
-my_MM=0
-nb=0
-nb_NO=0
-ne=0
-nl=Nederlands
-nl_BE=0
-nl_NL=0
-nn=Norsk nynorsk
-nn_NO=0
-no=Norsk bokmål
-no_NO=0
-no_NY=0
-nr=0
-oc=Occitan
-om=Oromoo
-or=ଓଡ଼ିଆ
-os=0
-pa=ਪੰਜਾਬੀ
-pl=Polski
-pl_PL=0
-ps=پښتو
-pt=Português
-pt_BR=0
-pt_PT=0
-qu=Runa Simi
-rm=Rumantsch
-ro=Română
-ro_RO=0
-ru=Русский
-ru_RU=0
-rw=Kinyarwanda
-sa=0
-sd=0
-se=Sámegiella
-se_NO=0
-si=0
-sk=Slovenčina
-sk_SK=0
-sl=Slovenščina
-sl_SI=0
-sl_SL=0
-sm=0
-so=0
-sp=0
-sq=Shqip
-sq_AL=0
-sr=Српски
-sr_YU=0
-ss=0
-st=0
-sv=Svenska
-sv_SE=0
-sv_SV=0
-sw=0
-ta=தமிழ்
-te=0
-tg=0
-th=ไทย
-th_TH=0
-ti=0
-tk=0
-tl=0
-to=0
-tr=Türkçe
-tr_TR=0
-ts=0
-tt=Татарча
-ug=0
-uk=Українська
-uk_UA=0
-ur=اردو
-ur_PK=0
-uz=0
-vi=Tiếng Việt
-vi_VN=0
-wa=0
-wo=0
-xh=0
-yi=ייִדיש
-yo=0
-zh=中文
-zh_CN=中文（简体）
-zh_HK=中文（香港）
-zh_TW=中文（繁體）
-zu=0