Update irrlicht Xcode project

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/0.8@12290 178a84e3-b1eb-0310-8ba1-8eac791a3b58

CMakeLists.txt

@@ -1,6 +1,6 @@
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "0.8.1")
+set(PROJECT_VERSION "0.8")
 
 cmake_minimum_required(VERSION 2.8.1)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
@@ -11,20 +11,8 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "STKRelease")
 endif()
 
-option(USE_WIIUSE "Support for wiimote input devices" ON)
+option(USE_WIIUSE "Support for wiimote input devices" OFF)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
-if(UNIX)
-    option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF)
-endif()
-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 :(
-    option(WIIUSE_BUILD "Build wiiuse lib (only for developers)" OFF)
-    mark_as_advanced(WIIUSE_BUILD)
-else()
-    set(WIIUSE_BUILD ON)
-endif()
 
 set(STK_SOURCE_DIR "src")
 set(STK_DATA_DIR "${PROJECT_SOURCE_DIR}/data")
@@ -44,22 +32,12 @@ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
 include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
 
-# Build the irrlicht library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
-include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
-
 # Build the Wiiuse library
-# Note: wiiuse MUST be declared after irrlicht, since otherwise
-# (at least on VS) irrlicht will find wiiuse io.h file because
-# of the added include directory.
 if(USE_WIIUSE)
-    if(WIIUSE_BUILD)
-        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
-    endif()
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
     include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse")
 endif()
 
-
 # Set include paths
 include_directories(${STK_SOURCE_DIR})
 
@@ -68,40 +46,15 @@ if(MSVC)
     set(ENV{PATH} ${PROJECT_SOURCE_DIR}/dependencies/include)
     set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
     set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
-    add_definitions(/D_IRR_STATIC_LIB_)
-endif()
-
-if(APPLE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
-elseif(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")   # Enable multi-processor compilation (faster)
 endif()
 
 # OpenAL
-if(APPLE)
-    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
-    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
-    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
-    # CMake pick the library it wants essentially means I can't build.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -framework OpenAL")
-    set(OPENAL_LIBRARY)
-else()
-    find_package(OpenAL REQUIRED)
-    include_directories(${OPENAL_INCLUDE_DIR})
-endif()
+find_package(OpenAL REQUIRED)
+include_directories(${OPENAL_INCLUDE_DIR})
 
 # OggVorbis
-if(APPLE)
-    # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
-    # unix-style installs of Vorbis/Ogg/OpenAL/etc. they will be picked up over our frameworks. This is blocking when I make releases :
-    # the mac I use to make STK releases does have other installs of vorbis/ogg/etc. which aren't compatible with STK, so letting
-    # CMake pick the library it wants essentially means I can't build.
-    set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -I/Library/Frameworks/Ogg.framework/Versions/A/Headers -I/Library/Frameworks/Vorbis.framework/Versions/A/Headers")
-else()
-    find_package(OggVorbis REQUIRED)
-    include_directories(${OGGVORBIS_INCLUDE_DIRS})
-endif()
+find_package(OggVorbis REQUIRED)
+include_directories(${OGGVORBIS_INCLUDE_DIRS})
 
 # CURL
 find_package(CURL REQUIRED)
@@ -119,11 +72,6 @@ if(USE_FRIBIDI)
     endif()
 endif()
 
-if(UNIX)
-    if(USE_CPP2011)
-        add_definitions("-std=gnu++11")
-    endif()
-endif()
 
 # OpenGL
 find_package(OpenGL REQUIRED)
@@ -137,6 +85,13 @@ else()
 endif()
 
 
+# Irrlicht
+if (APPLE)
+    set(IRRLICHT_LIBRARY "/Library/Frameworks/IrrFramework.framework")
+else()
+    set(IRRLICHT_LIBRARY ${PROJECT_SOURCE_DIR}/lib/irrlicht/lib/Linux/libIrrlicht.a)
+endif()
+
     
 # Set some compiler options
 if(UNIX)
@@ -171,7 +126,7 @@ source_group_hierarchy(STK_SOURCES STK_HEADERS)
 
 if(APPLE)
     # icon files to copy in the bundle
-    set(OSX_ICON_FILES ${PROJECT_SOURCE_DIR}/data/supertuxkart.icns)
+    set(OSX_ICON_FILES ${PROJECT_SOURCE_DIR}/src/ide/Xcode/stk.icns)
     set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(STK_SOURCES ${STK_SOURCES} ${OSX_ICON_FILES})
 
@@ -193,15 +148,10 @@ if(APPLE)
 
     # configure CMake to use a custom Info.plist
     set_target_properties(supertuxkart PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/data/SuperTuxKart-Info.plist)
+        MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/src/ide/Xcode/SuperTuxKart-Info.plist)
 
-    if(CMAKE_GENERATOR MATCHES "Xcode")
-        add_custom_command(TARGET supertuxkart POST_BUILD
-            COMMAND ln -f -s ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/\${CONFIGURATION}/supertuxkart.app/Contents/Resources)
-    else()
-        add_custom_command(TARGET supertuxkart POST_BUILD
-            COMMAND ln -f -s ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources)
-    endif()
+    add_custom_command(TARGET supertuxkart PRE_BUILD
+        COMMAND ln -s ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources)
 else()
     find_library(PTHREAD_LIBRARY NAMES pthread pthreadVC2 PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib)
     mark_as_advanced(PTHREAD_LIBRARY)
@@ -220,51 +170,42 @@ else()
 endif()
 
 
+# To invoke irrlicht makefile. Just a few things must be checked before it can be uncommented :
+# 1) make it pass NDEBUG=1
+# 2) make the stdout output visible
+
+#add_custom_target(
+#   stkirrlicht
+#   COMMAND make
+#   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/lib/irrlicht/source/Irrlicht
+#)
+#add_dependencies(supertuxkart stkirrlicht)
+
+include_directories(${PROJECT_SOURCE_DIR}/lib/irrlicht/include)
+
+
 # Common library dependencies
 target_link_libraries(supertuxkart
     bulletdynamics
     bulletcollision
     bulletmath
     enet
-    stkirrlicht
     ${CURL_LIBRARIES}
+    ${IRRLICHT_LIBRARIES}
     ${OGGVORBIS_LIBRARIES}
+    ${IRRLICHT_LIBRARY}
     ${IRRLICHT_XF86VM_LIBRARY}
     ${OPENAL_LIBRARY}
     ${OPENGL_LIBRARIES})
 
-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 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()
-
 if(USE_FRIBIDI)
     target_link_libraries(supertuxkart ${FRIBIDI_LIBRARIES})
     add_definitions(-DENABLE_BIDI)
 endif()
 
-# Wiiuse
-# ------
 if(USE_WIIUSE)
-    if(APPLE)
-        find_library(BLUETOOTH_LIBRARY NAMES IOBluetooth PATHS /Developer/Library/Frameworks/IOBluetooth.framework)
-        target_link_libraries(supertuxkart wiiuse ${BLUETOOTH_LIBRARY})
-    elseif(MSVC)
-        add_definitions("/DWIIUSE_STATIC")
-        if(WIIUSE_BUILD)
-            target_link_libraries(supertuxkart wiiuse)
-        else()
-            target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/wiiuse.lib)
-        endif()
-    else()
-        target_link_libraries(supertuxkart wiiuse bluetooth)
-    endif()
+    target_link_libraries(supertuxkart wiiuse bluetooth)
     add_definitions(-DENABLE_WIIUSE)
-
 endif()
 
 
@@ -273,10 +214,7 @@ add_subdirectory(tools/font_tool)
 
 
 # ==== Make dist target ====
-if(MSVC)
-  # Don't create a dist target for VS
-else()
-  add_custom_target(dist
+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}
@@ -285,15 +223,13 @@ else()
             && 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()
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 # ==== Install target ====
 install(TARGETS supertuxkart RUNTIME DESTINATION ${STK_INSTALL_BINARY_DIR} BUNDLE DESTINATION .)
 install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".svn" EXCLUDE)
 install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
-install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
+install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINATION share/pixmaps)
 
 set(PREFIX ${CMAKE_INSTALL_PREFIX})
 configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)

ChangeLog

@@ -1,27 +1,5 @@
-SuperTuxkart 0.8.1
-~~~~~~~~~~~~~~~~~~
-* New track STK Enterprise
-* Updated track The old mines
-* Updated Lighthouse track
-* Updated Zen Garden track
-* New Soccer mode
-* New Egg Hunt mode
-* New karts Xue and Sara
-* Updated Beastie kart
-* Added Tutorial
-* Added new Supertux difficulty
-* New bubblegum shield weapon
-* New Speeodmeter and nitro meter
-* Add ability to filter addons
-* Updated nitro models
-* Add ability to save and resume Grand Prix
-* Improve skid marks and nitro effects
-* Wiimote support
-
-
-
 SuperTuxkart 0.8
-~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
 * Story mode and new challenge set
 * Improved AI
 * Skidding and better collision physics
@@ -31,7 +9,6 @@ SuperTuxkart 0.8
 * Updated XR591 track
 * Updated Fort Magma track
 * Updated jungle track
-* Updates Sand track
 * Updated menus
 * New music
 

cmake/FindFribidi.cmake

@@ -9,34 +9,19 @@
 # FRIBIDI_LIBRARIES
 #     Fribidi library list
 
+
+find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers "${PROJECT_SOURCE_DIR}/dependencies/include")
+find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework "${PROJECT_SOURCE_DIR}/dependencies/lib")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
+
+
 if(APPLE)
-    set(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers)
-    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework)
-    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
-    include_directories(/Library/Frameworks/fribidi.framework/Headers)
-    #add_definitions(-framework fribidi)
-    set(FRIBIDI_FOUND 1)
-elseif(UNIX)
-    include(FindPkgConfig)
-    pkg_check_modules(FRIBIDI fribidi)
-else()
-    set(FRIBIDI_FOUND 0)
-endif()
-
-if(NOT FRIBIDI_FOUND)
-    find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers "${PROJECT_SOURCE_DIR}/dependencies/include")
-    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework "${PROJECT_SOURCE_DIR}/dependencies/lib")
-
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
-
-    if(APPLE)
-            set(FRIBIDI_INCLUDE_DIR "/Library/Frameworks/fribidi.framework/Headers")
-    endif()
-
-    # Publish variables
-    set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
-    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
+set(FRIBIDI_INCLUDE_DIR "/Library/Frameworks/fribidi.framework/Headers")
 endif()
 
+# Publish variables
+set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
+set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
 mark_as_advanced(FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)

cmake/FindIrrlicht.cmake

@@ -0,0 +1,80 @@
+# - Find Irrlicht
+# Find the Irrlicht includes and libraries
+#
+# Following variables are provided:
+# IRRLICHT_FOUND
+#     True if Irrlicht has been found
+# IRRLICHT_DIR
+#     Path to Irrlicht
+# IRRLICHT_INCLUDE_DIRS
+#     The include directories of Irrlicht
+# IRRLICHT_LIBRARIES
+#     Irrlicht library list
+
+set(IRRLICHT_DIR "" CACHE PATH "Path to Irrlicht")
+
+# Find include directory and library
+find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
+    PATHS ${IRRLICHT_DIR}
+        /Library/Frameworks/IrrFramework.framework/Versions/A/Headers/
+        ${PROJECT_SOURCE_DIR}/dependencies/include/irrlicht
+    PATH_SUFFIXES include irrlicht)
+
+if(APPLE)
+    find_library(IRRLICHT_LIBRARY NAMES IrrFramework PATHS /Library/Frameworks/IrrFramework.framework)
+else()
+    find_library(IRRLICHT_LIBRARY NAMES Irrlicht libIrrlicht
+        PATHS ${IRRLICHT_DIR}/lib/Linux ${PROJECT_SOURCE_DIR}/dependencies/lib ${PROJECT_SOURCE_DIR})
+endif()
+
+# Determine Irrlicht version
+if(EXISTS ${IRRLICHT_INCLUDE_DIR}/IrrCompileConfig.h)
+    file(STRINGS ${IRRLICHT_INCLUDE_DIR}/IrrCompileConfig.h IRRLICHT_COMPILE_CONFIG REGEX IRRLICHT_VERSION)
+    string(REGEX MATCH "IRRLICHT_VERSION_MAJOR ([0-9]+)" _tmp ${IRRLICHT_COMPILE_CONFIG})
+    set(IRRLICHT_VERSION_MAJOR ${CMAKE_MATCH_1})
+    string(REGEX MATCH "IRRLICHT_VERSION_MINOR ([0-9]+)" _tmp ${IRRLICHT_COMPILE_CONFIG})
+    set(IRRLICHT_VERSION_MINOR ${CMAKE_MATCH_1})
+    string(REGEX MATCH "IRRLICHT_VERSION_REVISION ([0-9]+)" _tmp ${IRRLICHT_COMPILE_CONFIG})
+    set(IRRLICHT_VERSION_REVISION ${CMAKE_MATCH_1})
+    set(IRRLICHT_VERSION "${IRRLICHT_VERSION_MAJOR}.${IRRLICHT_VERSION_MINOR}.${IRRLICHT_VERSION_REVISION}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Irrlicht
+    REQUIRED_VARS IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR
+    VERSION_VAR IRRLICHT_VERSION)
+
+# STK uses Irrlicht/OpenGL on all platforms
+find_package(OpenGL REQUIRED)
+
+# Publish variables
+set(IRRLICHT_INCLUDE_DIRS ${IRRLICHT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+set(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARY} ${OPENGL_LIBRARIES})
+mark_as_advanced(IRRLICHT_INCLUDE_DIR IRRLICHT_LIBRARY)
+
+# Check if Xxf86vm is required when building for platforms using X11
+if(UNIX AND NOT APPLE AND NOT CYGWIN)
+    find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
+    mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
+
+    set(IRRLICHT_SNIPPET "#include <irrlicht.h>
+        int main() { irr::createDevice(irr::video::EDT_NULL)\; return 0\; }")
+
+    include(CheckCXXSourceCompiles)
+    set(CMAKE_REQUIRED_INCLUDES ${IRRLICHT_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${IRRLICHT_LIBRARIES})
+    check_cxx_source_compiles(${IRRLICHT_SNIPPET} IRRLICHT_WITHOUT_XF86VM)
+
+    # If it did not work without Xxf86vm library try with it again
+    if(NOT IRRLICHT_WITHOUT_XF86VM)
+        set(CMAKE_REQUIRED_LIBRARIES ${IRRLICHT_LIBRARIES} ${IRRLICHT_XF86VM_LIBRARY})
+        check_cxx_source_compiles(${IRRLICHT_SNIPPET} IRRLICHT_WITH_XF86VM)
+
+        if(NOT IRRLICHT_WITH_XF86VM)
+            message(WARNING "Irrlicht does not compile with and without Xxf86vm")
+        endif()
+
+        # Add Xxf86vm nevertheless as tests might fail under strange circumstances
+        set(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARIES} ${IRRLICHT_XF86VM_LIBRARY})
+    endif()
+endif()

cmake/SourceGroupFunctions.cmake

@@ -3,25 +3,13 @@
 # - SRCS list of source files
 # - HDRS list of header files
 function(source_group_hierarchy SRCS HDRS)
-    if(MSVC)
-        # This removes the 'Source Files' folder, which is
-        # not really necessary. Also, put header and source
-        # files into the same folder
-        foreach(source_file ${${SRCS}})
-            source_group_file(${source_file} "")
-        endforeach()
-        foreach(header_file ${${HDRS}})
-            source_group_file(${header_file} "")
-        endforeach()
-    else()
-        foreach(source_file ${${SRCS}})
-            source_group_file(${source_file} "Source Files\\")
-        endforeach()
-        foreach(header_file ${${HDRS}})
-            source_group_file(${header_file} "Source Files\\")
-        endforeach()
-    endif()
+    foreach(source_file ${${SRCS}})
+        source_group_file(${source_file} "Source Files\\")
+    endforeach()
 
+    foreach(header_file ${${HDRS}})
+        source_group_file(${header_file} "Header Files\\")
+    endforeach()
 endfunction()
 
 # Determine source_group depending on file path

configure.ac

@@ -1,6 +1,6 @@
 # Process this file with autogen.sh to produce a configure script.
 
-AC_INIT(supertuxkart,0.8.1)
+AC_INIT(supertuxkart,0.8)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
 AC_PREREQ(2.61)
@@ -449,6 +449,7 @@ AC_CONFIG_FILES([                   \
  data/sfx/Makefile                  \
  data/textures/Makefile             \
  data/tracks/Makefile               \
+ data/tutorials/Makefile            \
  doc/Makefile                       \
  src/Makefile                       \
  src/ide/Makefile                   \

data/Makefile.am

@@ -1,7 +1,7 @@
 # data/
 
 SUBDIRS    = challenges fonts gfx gui karts models music po sfx textures tracks \
-             grandprix shaders
+             grandprix tutorials shaders
 
 pkgdatadir = $(datadir)/games/$(PACKAGE)/data
 
@@ -14,7 +14,7 @@ desktopdir = $(prefix)/share/applications
 desktop_DATA = supertuxkart.desktop
 
 icondir = $(prefix)/share/pixmaps
-dist_icon_DATA = supertuxkart_32.png supertuxkart_128.png
+dist_icon_DATA = supertuxkart_32.xpm supertuxkart_64.xpm
 
 
 # The desktop file needs the absolute path to the binary

data/challenges/fortmagma.challenge

@@ -19,6 +19,5 @@
 
     <unlock kart="gnu"/>
     <unlock kart="nolok"/>
-    <unlock difficulty="difficulty_best"/>
     <unlock track="fortmagma"/>
 </challenge>

data/challenges/lighthouse.challenge

@@ -6,15 +6,15 @@
     
     <hard>
         <karts number="5"/>
-        <requirements time="110" position="1"/>
+        <requirements time="90" position="1"/>
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="125"/>
+        <requirements time="95"/>
     </medium>
     <easy>
         <karts number="3"/>
-        <requirements time="145"/>
+        <requirements time="110"/>
     </easy>
 </challenge>
 

data/challenges/xr591.challenge

@@ -6,11 +6,11 @@
     
     <hard>
         <karts number="1"/>
-        <requirements energy="18" time="135"/>
+        <requirements energy="16" time="135"/>
     </hard>
     <medium>
         <karts number="1"/>
-        <requirements energy="15" time="155"/>
+        <requirements energy="14" time="155"/>
     </medium>
     <easy>
         <karts number="1"/>

data/gfx/explosion.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.3">
-
-    <spreading angle="180"         />
-    
-    <velocity  x="0.000"
-               y="0.0035"
-               z="0.000"           />
-    
-    <material  file="explode.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="800" />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1000"
-               max="1200"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.65"
-               max="0.95"
-               x-increase-factor="0.6"
-               y-increase-factor="0.6"
-               />
-    
-    <color     min="255 255 255"
-               max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
-
-</particles>

data/gfx/explosion_bomb.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.3">
-
-    <spreading angle="180"         />
-    
-    <velocity  x="0.000"
-               y="0.0035"
-               z="0.000"           />
-    
-    <material  file="explode.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="800" />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1000"
-               max="1200"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.65"
-               max="0.95"
-               x-increase-factor="0.6"
-               y-increase-factor="0.6"
-               />
-    
-    <color     min="255 255 255"
-               max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
-
-</particles>

data/gfx/explosion_cake.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.3">
-
-    <spreading angle="180"         />
-    
-    <velocity  x="0.000"
-               y="0.0035"
-               z="0.000"           />
-    
-    <material  file="explode.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="500"
-               max="800" />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1000"
-               max="1200"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.65"
-               max="0.95"
-               x-increase-factor="0.6"
-               y-increase-factor="0.6"
-               />
-    
-    <color     min="255 255 255"
-               max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="800"         />
-
-</particles>

data/gfx/jump_explosion.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="sphere" radius="0.3">
-
-    <spreading angle="180"         />
-    
-    <velocity  x="0.000"
-               y="0.0003"
-               z="0.010"           />
-    
-    <material  file="smoke.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="250"
-               max="400" />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="500"
-               max="600"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.65"
-               max="0.95"
-               x-increase-factor="0.6"
-               y-increase-factor="0.6"
-               />
-    
-    <color     min="255 255 255"
-               max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="1000"         />
-
-</particles>

data/gfx/nitro-smoke.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="box" box_x="0.35" box_y="0.2" box_z="0.2">
-
-    <spreading angle="30"         />
-    
-    <velocity  x="0.0"
-               y="0.001"
-               z="-0.003"         />
-    
-    <material  file="smoke_nitro.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="200"
-               max="300"          />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="400"
-               max="600"          />
-    
-    <!-- Size of the particles -->
-    <size      min="0.20"
-               max="0.40"         />
-    
-    <color     min="255 255 255"
-               max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"         />
-
-</particles>

data/gfx/nitro.xml

@@ -1,33 +1,30 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="0.05" box_y="0.05" box_z="0.05">
+<particles emitter="box" box_x="0.35" box_y="0.2" box_z="0.2">
 
-    <spreading angle="2"         />
+    <spreading angle="30"         />
     
     <velocity  x="0.0"
                y="0.001"
-               z="0.000"         />
+               z="-0.003"         />
     
     <material  file="nitro-particle.png"  />
     
     <!-- Amount of particles emitted per second -->
-    <rate      min="100"
-               max="200" />
+    <rate      min="400"
+               max="600"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="10"
-               max="20"          />
+    <lifetime  min="400"
+               max="600"          />
     
     <!-- Size of the particles -->
-    <size      min="0.1"
-               max="0.25"         
-               x-increase-factor="1.2"
-               y-increase-factor="1.2"
-               />
+    <size      min="0.20"
+               max="0.40"         />
     
     <color     min="255 255 255"
                max="255 255 255"  />
     
     <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
+    <fadeout   time="100"         />
 
 </particles>

data/gfx/skid1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="0.023" box_y="0.023" box_z="-0.5">
+<particles emitter="box" box_x="0.35" box_y="0.2" box_z="0.2">
 
-    <spreading angle="5"          />
+    <spreading angle="30"         />
     
     <velocity  x="0.0"
                y="0.001"
@@ -12,21 +12,21 @@
     <!-- Amount of particles emitted per second. The minimum rate
          is used to show that the skidding bonus is now available,
          the maximum is used when the skid bonus is applied to the kart -->
-    <rate      min="900"
-               max="900"          />
+    <rate      min="200"
+               max="600"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="10"
-               max="10"          />
+    <lifetime  min="400"
+               max="600"          />
     
     <!-- Size of the particles -->
-    <size      min="0.35"
-               max="0.35"         />
+    <size      min="0.20"
+               max="0.40"         />
     
     <color     min="255 255 255"
                max="255 255 255"  />
     
     <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
+    <fadeout   time="100"         />
 
 </particles>

data/gfx/skid2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<particles emitter="box" box_x="0.023" box_y="0.023" box_z="-0.5">
+<particles emitter="box" box_x="0.35" box_y="0.2" box_z="0.2">
 
-    <spreading angle="5"         />
+    <spreading angle="30"         />
     
     <velocity  x="0.0"
                y="0.001"
@@ -12,21 +12,21 @@
     <!-- Amount of particles emitted per second. The minimum rate
          is used to show that the skidding bonus is now available,
          the maximum is used when the skid bonus is applied to the kart -->
-    <rate      min="900"
-               max="900"          />
+    <rate      min="200"
+               max="600"          />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="10"
-               max="10"          />
+    <lifetime  min="400"
+               max="600"          />
     
     <!-- Size of the particles -->
-    <size      min="0.35"
-               max="0.75"         />
+    <size      min="0.20"
+               max="0.40"         />
     
     <color     min="255 255 255"
                max="255 255 255"  />
     
     <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="5"         />
+    <fadeout   time="100"         />
 
 </particles>

data/gui/License.txt

@@ -7,12 +7,7 @@ Except :
 main_*.png icons, hourglass, back, back_addons, next_addons, package.png
     released under Creative-Commons BY-SA 3, By yeKcim (Anthony Carré)
 
-mode_tt, released under Creative-Commons BY-SA 3, incorporatings artwork from yeKcim and onyum.com,
-         modified by Totoplus62
-
-mode_easter, mode_ftl, mode_soccer, mode_normal, race_giveup: by Totoplus62, released under CC-BY-SA 3.0
-
-tutorial.png    by Totoplus62, released under CC-BY-SA 3.0
+mode_tt, released under Creative-Commons BY-SA 3, incorporatings artwork from yeKcim and onyum.com
 
 Logo and Logo_slim : under CC-BY-SA 3.0+ by 'rastapax'
 
@@ -22,9 +17,7 @@ title_font, by Marianne Gagnon (Auria), released under CC-BY-SA 3+
 
 screen*.png, by Marianne Gagnon (Auria), including elements from the public domain Tango icon set
 
-Gauge and bar by Totoplus62, released under CC-BY-SA 3
-
-menu_story by tavariz91, released under CC-0
+Gauge and bar by Dakal, released under CC-BY-SA 3
 
 ====
 

data/gui/addons_loading.stkgui

@@ -16,8 +16,8 @@
                 <label id="size"     width="100%" text=""/>
                 <label id="revision" width="100%" text=""/>
             </div>
-            <div width="50%" height="32" layout="vertical-row" >
-                <ratingbar id="rating" height="64" width="100%" /> 
+            <div width="50%" height="100%" layout="vertical-row" >
+                <label id="rating"   width="100%" text=""/>
             </div>
         </div>
         <spacer height="10"/>

data/gui/addons_screen.stkgui

@@ -5,21 +5,10 @@
     <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
         <icon-button id="back"   height="100%" icon="gui/back.png"/>
         <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
-        <icon-button id="reload"   height="90%" icon="gui/restart.png"/>
+        <button      id="reload" I18N="Reload button to reload addon data" text="Reload" />
+        <spacer width="15" height="10" />
     </div>
     
-    <box id="filter_box" width="97%" height="75" layout="vertical-row" align="center">
-        <div x="0" y="0" width="98%" height="100%" layout="horizontal-row" align="center">
-            <textbox id="filter_name" proportion="9" align="center" />
-            <spacer width="10" />
-            <label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/>
-            <spinner id="filter_date" proportion="5" align="center" min_value="0" wrap_around="true"/>
-            <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating"/>
-            <spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/>
-            <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
-        </div>
-    </box>
-    
     <spacer height="15" width="10"/>
 
     <tabs id="category" height="10%" max_height="110" width="90%" align="center">
@@ -30,11 +19,12 @@
         <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
                 I18N="Section in the addons menu" text="Arenas"/>
     </tabs>
-
-    <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
-        <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
-    </box>
-       
+    <spacer height="5" width="10"/>
+    
+    <list id="list_addons" proportion="1" width="97%" align="center"/>
+        
+    <spacer width="1" height="8" /> 
+        
 </div>
 
 </stkgui>

data/gui/arenas.stkgui

@@ -9,7 +9,7 @@
     
     <spacer width="20" height="5" />
     
-    <box proportion="1" width="100%" layout="vertical-row" padding="2">
+    <box proportion="1" width="100%" layout="vertical-row">
         <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true" 
             label_location="bottom" align="center" child_width="160" child_height="120" />
         <spacer width="20" height="13" />

data/gui/credits.stkgui

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

data/gui/karts.stkgui

@@ -1,6 +1,6 @@
 <stkgui>
 
-<div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
+<div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
 
     <header width="80%"
            I18N="In the kart selection (player setup) screen"
@@ -13,13 +13,13 @@
     
     <spacer height="15" width="25"/>
     
-    <box proportion="2" width="100%" layout="vertical-row" padding="2">
+    <box proportion="2" width="100%" layout="vertical-row">
         <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
                      child_width="90" child_height="90" max_rows="3"/>
     </box>
     
     <!-- Groups will be added dynamically at runtime -->
-    <tabs width="98%" x="1%" height="25" id="kartgroups">
+    <tabs width="100%" height="25" id="kartgroups">
     </tabs>
     <spacer width="100%" height="2%"/>
 </div>

data/gui/main.stkgui

@@ -37,8 +37,6 @@
                              I18N="Main menu button"  text="Options" label_location="hover"/>
                 <icon-button id="help" width="64" height="64" icon="gui/main_help.png"  extend_label="50"
                              I18N="Main menu button" text="Help" label_location="hover"/>
-                <icon-button id="startTutorial" width="64" height="64" icon="gui/tutorial.png" extend_label="150"
-                             I18N="Main menu button" text="Tutorial" label_location="hover"/>
                 <icon-button id="about" width="64" height="64" icon="gui/main_about.png"  extend_label="50"
                              I18N="Main menu button" text="About" label_location="hover"/>
                 <icon-button id="quit" width="64" height="64" icon="gui/main_quit.png"  extend_label="50"

data/gui/materials.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<materials>
- 
-  <material name="speedback.png"    compositing="test" clampU="Y" clampV="Y" light="N" ignore="Y"/>
-  <material name="speedfore.png"    compositing="test" clampU="Y" clampV="Y" light="N" ignore="Y"/>
-  <material name="notes.png"             compositing="test" light="N" ignore="Y"/>
-  <material name="soccer_player_red.png"             compositing="blend" light="N" ignore="Y"/>
-  <material name="soccer_player_blue.png"             compositing="blend" light="N" ignore="Y"/>
-
-</materials>