Fixed compilation ... again :P

.travis.yml

@@ -21,27 +21,19 @@ before_install:
   - 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`
-  # Unfortunately using all threads crashes g++: "g++: internal compiler error: Killed (program cc1plus)"
-  - export THREADS=4
-  - echo "THREADS = $THREADS"
-
 script:
-  
   # First a debug build: 
   - mkdir build-debug
   - cd build-debug
   - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
-  - make VERBOSE=1 -j $THREADS
+  - make VERBOSE=1 -j 4 
 
   # Then a release build: 
   - cd ..
   - mkdir build-release
   - cd build-release
   - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
-  - make VERBOSE=1 -j $THREADS
+  - make VERBOSE=1 -j 4 
 
 notifications:
   irc:

CHANGELOG.md

@@ -1,16 +1,3 @@
-## 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

CMakeLists.txt

@@ -19,9 +19,8 @@ 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(MSVC AND (MSVC_VERSION LESS 1900))
+if(MSVC)
     # Normally hide the option to build wiiuse on VS, since it depends
     # on the installation of the Windows DDK (Driver Developer Kit),
     # which also needs an absolute path :(
@@ -124,15 +123,9 @@ endif()
 
 
 # Build the angelscript library if not in system
-if(USE_SYSTEM_ANGELSCRIPT)
-    find_package(Angelscript)
-    if(ANGELSCRIPT_FOUND)
-        include_directories(${Angelscript_INCLUDE_DIRS})
-    else()
-        message(FATAL_ERROR "Angelscript not found. "
-            "Either install angelscript or use built-in version using "
-            "-DUSE_SYSTEM_ANGELSCRIPT=0")
-    endif()
+find_package(Angelscript)
+if(USE_SYSTEM_ANGELSCRIPT AND ANGELSCRIPT_FOUND)
+    include_directories(${Angelscript_INCLUDE_DIRS})
 else()
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
     include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
@@ -164,15 +157,6 @@ else()
     include_directories(${OGGVORBIS_INCLUDE_DIRS})
 endif()
 
-# Freetype
-find_package(Freetype)
-if(FREETYPE_FOUND)
-    include_directories(${FREETYPE_INCLUDE_DIRS})
-else()
-    message(FATAL_ERROR "Freetype not found. "
-        "Freetype is required to display characters in SuperTuxKart. ")
-endif()
-
 # Fribidi
 if(USE_FRIBIDI)
     find_package(Fribidi)
@@ -221,22 +205,12 @@ if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
 endif()
 
-# Netwowk Multiplayer
-if(ENABLE_NETWORK_MULTIPLAYER)
-  add_definitions(-DENABLE_NETWORK_MULTIPLAYER_SCREEN)
-endif()
-
 if(WIN32)
     # By default windows.h has macros defined for min and max that screw up everything
     add_definitions(-DNOMINMAX)
 
     # And shut up about unsafe stuff
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-
-    # Avoid timespec structure redeclaration on Visual Studio 2015
-    if (NOT (MSVC_VERSION LESS 1900))
-        add_definitions(-DHAVE_STRUCT_TIMESPEC)
-    endif()
 endif()
 
 if(MSVC)
@@ -348,7 +322,6 @@ target_link_libraries(supertuxkart
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
     ${OPENGL_LIBRARIES}
-    ${FREETYPE_LIBRARIES}
     )
 
 if(UNIX AND NOT APPLE)
@@ -408,7 +381,7 @@ if(MSVC OR MINGW)
 endif()
 
 if(MINGW)
-    find_library(LIBGCC NAMES "libgcc_s_dw2-1.dll" "libgcc_s_sjlj-1.dll" "libgcc_s_seh-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
+    find_library(LIBGCC NAMES "libgcc_s_dw2-1.dll" "libgcc_s_sjlj-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH})
     if(LIBGCC)
         file(COPY ${LIBGCC} DESTINATION ${CMAKE_BINARY_DIR}/bin/)
     endif()
@@ -426,6 +399,27 @@ if(MINGW)
     endif()
 endif()
 
+# Optional tools
+add_subdirectory(tools/font_tool)
+
+
+# ==== Make dist target ====
+if(MSVC OR MINGW)
+  # Don't create a dist target for VS
+else()
+  add_custom_target(dist
+    COMMAND rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} && rm -f ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2
+            && echo "Exporting..."
+            && svn export ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
+            && echo "Compressing..."
+            && cd ${CMAKE_BINARY_DIR}
+            && tar -cjf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 ./SuperTuxKart-${PROJECT_VERSION}
+            && echo "Done, cleaning up"
+            && rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
+endif()
+
 
 # ==== Checking if data folder exists ====
 if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)

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:
 
@@ -50,18 +50,14 @@ 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
@@ -70,9 +66,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,9 +23,9 @@ Hope you enjoy the game.
 * Ideally, you want a joystick with at least 6 buttons.
 
 
-## Compiling SuperTuxKart
+##Compiling SuperTuxKart
 
-### Windows
+###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).
@@ -38,24 +38,24 @@ 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.md`](INSTALL.md) for details.
+###UNIX
+See `INSTALL` for details.
 
 
-## License
+##License
 This software is released under the GNU General Public License (GPL) which
-can be found in the file [`COPYING`](/COPYING) in the same directory as this file.
+can be found in the file `LICENSE` in the same directory as this file.
 Information about the licenses for artwork are contained in 
 `data/licenses`.
 
 
-## 3D coordinates
+##3D coordinates
 A reminder for those looking at the code and 3d models:
 
 STK    : X right, Y up,       Z forwards

cmake/FindAngelscript.cmake

@@ -14,11 +14,11 @@ FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
     )
 
 FIND_LIBRARY(Angelscript_LIBRARY
-    NAMES angelscript angelscript_s
+    NAMES angelscript
     PATHS
     /usr/local
     /usr
-    PATH_SUFFIXES lib lib64 lib32
+    PATH_SUFFIXES lib
     )
 
 # handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if

cmake/FindFreetype.cmake

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

cmake/Toolchain-mingw-64bit.cmake

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

cmake/Toolchain-mingw.cmake

@@ -1,6 +1,3 @@
-# Usage:
-# cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw.cmake 
-
 # the name of the target operating system
 SET(CMAKE_SYSTEM_NAME Windows)
 

data/challenges/islandtrack.challenge

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

data/challenges/olivermath.challenge

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

data/challenges/subsea.challenge

@@ -6,7 +6,7 @@
     
     <hard>
         <karts number="5"/>
-        <requirements position="1" time="205"/>
+        <requirements position="1" time="200"/>
     </hard>
     <medium>
         <karts number="4"/>

data/fonts/materials.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<materials>
+  <!-- Fonts -->
+  <material name="title_font.png"           shader="unlit" lazy-load="Y"/>
+  <material name="title_font_2.png"         shader="unlit" lazy-load="Y"/>
+  <material name="sigmar0.png"              shader="unlit" lazy-load="Y"/>
+  <material name="comix.png"                shader="unlit" lazy-load="Y"/>
+  <material name="LayneHansom0.png"         shader="unlit" lazy-load="Y"/>
+  <material name="Mplus2p_JP0.png"          shader="unlit" lazy-load="Y"/>
+  <material name="rasheeq0.png"             shader="unlit" lazy-load="Y"/>
+  <material name="rasheeq3.png"             shader="unlit" lazy-load="Y"/>
+  <material name="rasheeq4.png"             shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei0.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei1.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei2.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei3.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei4.png"         shader="unlit" lazy-load="Y"/>
+  <material name="wqyMicroHei5.png"         shader="unlit" lazy-load="Y"/>
+  <material name="AR_PL_SungtiL_GB0.png"    shader="unlit" lazy-load="Y"/>
+  <material name="LayneHansomBigDigits.png" shader="unlit" lazy-load="Y"/>
+
+</materials>

data/gfx/black_smoke.xml

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

data/gfx/confetti.xml

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

data/gfx/confetti_bleu.xml

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

data/gfx/gfx_blueNebula_a.xml

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

data/gfx/gfx_bubbleFast_a.xml

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

data/gfx/gfx_fireworkExplosion_a.xml

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

data/gfx/gfx_fireworkGreen_a.xml

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

data/gfx/gfx_sandExplosion_a.xml

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

data/gfx/gfx_smallWaterFlow.xml

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

data/gui/challenges.stkgui

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
+
+        <header I18N="Title for challenges screen" text="Challenges - Trophy Room" text_align="center" align="center" width="80%" />
+
+        <spacer height="5" width="100%"/>
+
+        <box width="100%" proportion="5" layout="vertical-row">
+
+            <ribbon_grid id="challenges" proportion="8" width="100%"
+                label_location="bottom" align="center" child_width="128" child_height="128" />
+
+
+            <spacer proportion="1" width="100%"/>
+        </box>
+    </div>
+</stkgui>

data/gui/enter_player_name_dialog.stkgui

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

data/gui/main.stkgui

@@ -39,31 +39,31 @@
             <spacer width="10" height="10" />
 
             <buttonbar id="menu_bottomrow" x="0" y="0" width="38%" height="100%" align="center">
-                <icon-button id="test_gpwin" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_gpwin" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              raw_text="TEST: GPWin" label_location="hover"/>
-                <icon-button id="test_gplose" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_gplose" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              raw_text="TEST: GPLose" label_location="hover"/>
-                <icon-button id="test_unlocked" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_unlocked" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              raw_text="TEST: Unlocked" label_location="hover"/>
-                <icon-button id="test_unlocked2" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_unlocked2" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              raw_text="TEST: Unlocked 2" label_location="hover"/>
-                <icon-button id="test_intro" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_intro" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              raw_text="TEST: Intro" label_location="hover"/>
-                <icon-button id="test_outro" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_outro" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              raw_text="TEST: Outro" label_location="hover"/>     
-                <icon-button id="options" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="options" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              I18N="In the main screen"  text="Options" label_location="hover"/>
-                <icon-button id="help" width="64" height="64" icon="gui/main_help.png"
+                <icon-button id="help" width="64" height="64" icon="gui/main_help.png"  extend_label="50"
                              I18N="In the main screen" text="Help" label_location="hover"/>
-                <icon-button id="startTutorial" width="64" height="64" icon="gui/tutorial.png"
+                <icon-button id="startTutorial" width="64" height="64" icon="gui/tutorial.png" extend_label="150"
                              I18N="In the main screen" text="Tutorial" label_location="hover"/>
-                <icon-button id="achievements" width="64" height="64" icon="gui/gp_copy.png"
+                <icon-button id="achievements" width="64" height="64" icon="gui/gp_copy.png" extend_label="150"
                              I18N="In the main screen" text="Achievements" label_location="hover"/>
-                <icon-button id="gpEditor" width="64" height="64" icon="gui/gpeditor.png"
+                <icon-button id="gpEditor" width="64" height="64" icon="gui/gpeditor.png" extend_label="150"
                              I18N="In the main screen" text="Grand Prix Editor" label_location="hover"/>
-                <icon-button id="about" width="64" height="64" icon="gui/main_about.png"
+                <icon-button id="about" width="64" height="64" icon="gui/main_about.png"  extend_label="50"
                              I18N="In the main screen" text="About" label_location="hover"/>
-                <icon-button id="quit" width="64" height="64" icon="gui/main_quit.png"
+                <icon-button id="quit" width="64" height="64" icon="gui/main_quit.png"  extend_label="50"
                              I18N="In the main screen" text="Quit" label_location="hover"/>
             </buttonbar>
         </bottombar>

data/gui/online/create_server.stkgui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-        <header id="title" text_align="center" width="80%" align="center" I18N="In the server creation screen" text="Server Creation"/>
+        <header text_align="center" width="80%" align="center" I18N="In the server creation screen" text="Server Creation"/>
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
             <div width="90%" align="center" layout="vertical-row" y="2%" height="96%">

data/gui/online/main.stkgui

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
+
+        <header text_align="center" width="80%" align="center" I18N="In the online multiplayer screen" text="Online Multiplayer"/>
+        <spacer height="15" width="10"/>
+        <box proportion="4" width="90%" layout="vertical-row" align="center">
+            <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" id="outer_box" >
+                <!-- TODO: Here will come some information.. or statistics.. or whatever. Yet to be filled in! It will change depending on state. And I'd also like a close button at the right top. -->
+                <label I18N="In the online multiplayer screen" proportion="4"
+                    word_wrap="true" text="" align="center"/>
+            </div>
+        </box>
+
+        <buttonbar id="menu_toprow" proportion="3" width="90%" align="center">
+            <icon-button id="quick_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"/>
+            <icon-button id="find_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_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"/>
+        </buttonbar>
+
+        <spacer width="10" height="7%"/>
+
+        <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/online_screen.stkgui

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

data/gui/tutorial.stkgui

@@ -0,0 +1,19 @@
+<?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 tutorials screen" text="Tutorial - Selection Room" text_align="center" width="100%" />
+
+        <spacer proportion="1" width="100%"/>
+
+        <list id="tutorials" proportion="5" width="75%" align="center"/>
+
+        <spacer proportion="1" width="100%"/>
+        <spacer width="100%" height="45"/>
+
+    </div>
+
+    <button id="play" x="-200" y="-40" height="35" align="right" text="Play all"/>
+</stkgui>

data/po/.gitattributes

@@ -1 +0,0 @@
-*.sh -crlf

data/po/.gitignore

@@ -1,3 +1,2 @@
 transifex
-tx.exe
-gui_strings.h
+tx.exe

data/po/da_DK.po

@@ -3366,4 +3366,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
+msgstr "Launchpad Contributions:"