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

@@ -0,0 +1,236 @@
+# root CMakeLists for the SuperTuxKart project
+project(SuperTuxKart)
+set(PROJECT_VERSION "0.8")
+
+cmake_minimum_required(VERSION 2.8.1)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
+
+include(BuildTypeSTKRelease)
+if (NOT CMAKE_BUILD_TYPE)
+    message(STATUS "No build type selected, default to STKRelease")
+    set(CMAKE_BUILD_TYPE "STKRelease")
+endif()
+
+option(USE_WIIUSE "Support for wiimote input devices" OFF)
+option(USE_FRIBIDI "Support for right-to-left languages" ON)
+
+set(STK_SOURCE_DIR "src")
+set(STK_DATA_DIR "${PROJECT_SOURCE_DIR}/data")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
+
+# Define install paths
+set(STK_INSTALL_BINARY_DIR "bin" CACHE
+    STRING "Install executable to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
+set(STK_INSTALL_DATA_DIR "share/supertuxkart" CACHE
+    STRING "Install data folder to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
+
+# Build the Bullet physics library
+add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
+include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
+
+# Build the ENet UDP network library
+add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
+
+# Build the Wiiuse library
+if(USE_WIIUSE)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse")
+endif()
+
+# Set include paths
+include_directories(${STK_SOURCE_DIR})
+
+# These variables enable MSVC to find libraries located in "dependencies"
+if(MSVC)
+    set(ENV{PATH} ${PROJECT_SOURCE_DIR}/dependencies/include)
+    set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
+    set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
+endif()
+
+# OpenAL
+find_package(OpenAL REQUIRED)
+include_directories(${OPENAL_INCLUDE_DIR})
+
+# OggVorbis
+find_package(OggVorbis REQUIRED)
+include_directories(${OGGVORBIS_INCLUDE_DIRS})
+
+# CURL
+find_package(CURL REQUIRED)
+include_directories(${CURL_INCLUDE_DIRS})
+
+# Fribidi
+if(USE_FRIBIDI)
+    find_package(Fribidi)
+    if(FRIBIDI_FOUND)
+        include_directories(${FRIBIDI_INCLUDE_DIRS})
+    else()
+        message(FATAL_ERROR "Fribidi not found. "
+            "Either install fribidi or disable bidi support with -DUSE_FRIBIDI=0 "
+            "(if you don't use a right-to-left language then you don't need this).")
+    endif()
+endif()
+
+
+# OpenGL
+find_package(OpenGL REQUIRED)
+include_directories(${OPENGL_INCLUDE_DIR})
+
+if(UNIX AND NOT APPLE)
+    find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
+    mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
+else()
+    set(IRRLICHT_XF86VM_LIBRARY "")
+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)
+    add_definitions(-Wall)
+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)
+endif()
+
+# TODO: remove this switch
+add_definitions(-DHAVE_OGGVORBIS)
+
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+    add_definitions(-DDEBUG)
+else()
+    add_definitions(-DNDEBUG)
+endif()
+
+
+# Provides list of source and header files (STK_SOURCES and STK_HEADERS)
+include(sources.cmake)
+
+# Generate source groups useful for MSVC project explorer
+include(cmake/SourceGroupFunctions.cmake)
+source_group_hierarchy(STK_SOURCES STK_HEADERS)
+
+
+if(APPLE)
+    # icon files to copy in the bundle
+    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})
+
+    # build the executable and create an app bundle
+    add_executable(supertuxkart MACOSX_BUNDLE ${STK_SOURCES})
+
+    find_library(IOKIT_LIBRARY IOKit)
+    find_library(QUICKTIME_LIBRARY QuickTime)
+    find_library(CARBON_LIBRARY Carbon)
+    find_library(AUDIOUNIT_LIBRARY AudioUnit)
+    find_library(COCOA_LIBRARY Cocoa)
+
+    target_link_libraries(supertuxkart
+         ${IOKIT_LIBRARY}
+         ${QUICKTIME_LIBRARY}
+         ${CARBON_LIBRARY}
+         ${AUDIOUNIT_LIBRARY}
+         ${COCOA_LIBRARY})
+
+    # configure CMake to use a custom Info.plist
+    set_target_properties(supertuxkart PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/src/ide/Xcode/SuperTuxKart-Info.plist)
+
+    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)
+
+    # Set data dir (absolute or relative to CMAKE_INSTALL_PREFIX)
+    get_filename_component(STK_INSTALL_DATA_DIR_ABSOLUTE ${STK_INSTALL_DATA_DIR} ABSOLUTE)
+    if(${STK_INSTALL_DATA_DIR_ABSOLUTE} STREQUAL ${STK_INSTALL_DATA_DIR})
+        add_definitions(-DSUPERTUXKART_DATADIR=\"${STK_INSTALL_DATA_DIR_ABSOLUTE}\")
+    else()
+        add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/${STK_INSTALL_DATA_DIR}\")
+    endif()
+
+    # Build the final executable
+    add_executable(supertuxkart ${STK_SOURCES} ${STK_HEADERS})
+    target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
+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
+    ${CURL_LIBRARIES}
+    ${IRRLICHT_LIBRARIES}
+    ${OGGVORBIS_LIBRARIES}
+    ${IRRLICHT_LIBRARY}
+    ${IRRLICHT_XF86VM_LIBRARY}
+    ${OPENAL_LIBRARY}
+    ${OPENGL_LIBRARIES})
+
+if(USE_FRIBIDI)
+    target_link_libraries(supertuxkart ${FRIBIDI_LIBRARIES})
+    add_definitions(-DENABLE_BIDI)
+endif()
+
+if(USE_WIIUSE)
+    target_link_libraries(supertuxkart wiiuse bluetooth)
+    add_definitions(-DENABLE_WIIUSE)
+endif()
+
+
+# Optional tools
+add_subdirectory(tools/font_tool)
+
+
+# ==== Make dist target ====
+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})
+
+# ==== 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.xpm data/supertuxkart_64.xpm DESTINATION share/pixmaps)
+
+set(PREFIX ${CMAKE_INSTALL_PREFIX})
+configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
+add_dependencies(supertuxkart supertuxkart.desktop)

COPYING

@@ -5,8 +5,6 @@ through the various data subdirectories. Data files are released under a mixture
 
 Gnu GPL 2.0 and 3.0+
 Creative-Commons-BY(-SA) 3.0
-Creative-Commons-Sampling+ 1.0
-SoundSnap license
 Public Domain
 
 ________________________________________________________________________________

ChangeLog

@@ -1,3 +1,35 @@
+SuperTuxkart 0.8
+~~~~~~~~~~~~~~~~
+* Story mode and new challenge set
+* Improved AI
+* Skidding and better collision physics
+* Reverse mode
+* New green valley track
+* New Blackhill Mansion track
+* Updated XR591 track
+* Updated Fort Magma track
+* Updated jungle track
+* Updated menus
+* New music
+
+
+SuperTuxKart 0.7.3
+~~~~~~~~~~~~~~~~~~
+* New Zen Garden and Subsea tracks
+* New Island battle arena
+* New Suzanne kart
+* New graphical effects
+* New weapons 'Swatter' and 'Rubber Ball'
+* Added Thunderbird as race referee
+* 3 Strikes Battles now displays lives as spare tires
+* Improved bubble gum
+* See progression during Grand Prix
+* Improve physics for tall karts (e.g. Adiumy)
+* Lots of bug fixes
+* Improved kart control at high speeds
+* Better placement of rescued karts
+* Transition track-making to blender 2.5/2.6
+
 SuperTuxKart 0.7.2
 ~~~~~~~~~~~~~~~~~~
 * Added in-game addon manager

INSTALL

@@ -7,22 +7,32 @@ General
 First, make sure that you have the following packages installed:
 
   * OpenGL (or Mesa 3.0 or later)
-  * Irrlicht 1.7 or later
-  * OpenAL
+  * OpenAL (recommended: openal-soft-devel)
+  * Ogg    (libogg-dev)
+  * Vorbis (libvorbis-dev)
+  * fribidi (fribidi-devel) - optional for right-to-left text
 
 Unpack the files from the tarball like this:
 
   tar xzf supertuxkart-*.tar.gz
   cd supertuxkart-*
 
+where '*' is the version of SuperTuxkart you downloaded - eg 0.8.0. Then:
 
-where '*' is the version of SuperTuxkart you downloaded - eg 0.2.0. Then:
+* Build irrlicht (atm, this will be included in cmake soonish)
+  cd lib/irrlicht/source/Irrlicht
+  NDEBUG=1 make
 
-  ./configure
-  make
+* Compile SuperTuxKart:
+    mkdir cmake_build 
+    cd cmake_build 
+    cmake .. 
+    make VERBOSE=1 -j2
+  To create a debug version of STK, use:
+    cmake .. -DCMAKE_BUILD_TYPE=Debug
 
 To test the compilation, supertuxkart can be run from the build
-directory by ./src/supertuxkart  (./src/supertuxkart.exe on windows).
+directory by ./bin/supertuxkart 
 
 To install the file, as root execute:
 
@@ -31,67 +41,14 @@ To install the file, as root execute:
 The default install location is /usr/local, i.e. the data files will
 be written to /usr/local/share/games/supertuxkart, the executable
 will be copied to /usr/local/bin. To change the default installation
-location, use the "--prefix" option of configure, e.g. --prefix=/usr
-See the --help output of configure for further options.
+location, specify CMAKE_INSTALL_PREFIX when running cmake, e.g.:
+  cmake .. -DCMAKE_INSTALL_PREFIX=/opt/stk
+
+Building STK on OS X
+--------------------
+See http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX
 
 
-SVN STK on Ubuntu
------------------
-Here are the compilation instructions for the current svn(2009-10-15) of
-Super Tux Kart originally contributed by Damien for Ubuntu Edgy, and updated
-to 9.04 version:
-
-install following packages:
-# apt-get install libtool libxxf86vm-dev libopenal-dev
-libglu1-mesa-dev subversion autoconf automake1.9 g++ gcc
-
-do a:
-$ svn checkout https://supertuxkart.svn.sourceforge.net/svnroot/supertuxkart/main/trunk
-
-Get irrlicht-1.x.zip and unzip it, compile irrlicht:
-$ cd irrlicht-1.x/source/Irrlicht/
-$ make
-$ cd ../../..
-$ pwd
-/some/path/
-
-then we can move to stk, remember to replace the output of pwd below:
-$ cd trunk
-note that the "--with-irrlicht" argument below is only required if you didn't install irrlicht to /usr/[local]
-$ ./autogen.sh && ./configure --with-irrlicht=/some/path/irrlicht-1.x/ && make
-and if all went well run the game:
-$ src/supertuxkart
-
-tested with g++ 3.3 and 4.1 , both succeeded.
-
-If you want to install the game system-wide, do 'make install'.
-
-To update the source from inside trunk directory, one simple command:
-$ svn up
-and then, in most cases, just rebuild:
-$ make
-with the exception of changes to any Makefile.am, in which case:
-$ ./autogen.sh && ./configure --with-irrlicht=/some/path/irrlicht-1.x/ && make
-
-
-But it didn't work!
--------------------
-
-If you checked out your copy directly from SVN, you have to run
-'sh autogen.sh' to generate the configure script.
-
-You should check the SuperTuxKart wiki at:
-
-http://supertuxkart.sourceforge.net/
-
-
-Also, the most common (by FAR) reason for problems is that your OpenGL/Mesa
-is incorrectly installed - so before you complain to any of the Irrlicht or
-Supertuxkart mailing lists, first try running one of the example programs
-that comes with your OpenGL implementation - or one of the Mesa or GLUT
-sample programs.
-
-If THOSE run correctly - but Supertuxkart doesn't then please get in touch
-with the SupertuxKart mailing list and we'll do our best to get you up and
-racing.
-
+Building STK on Windows
+-----------------------
+See http://supertuxkart.sourceforge.net/How_to_build_the_Windows_version

Makefile.am

@@ -1,8 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data
+SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data tools
 
 pkgdatadir=$(datadir)/doc/$(PACKAGE)
 dist_pkgdata_DATA=AUTHORS ChangeLog COPYING README
+EXTRA_DIST=autogen.sh m4 CMakeLists.txt
+
 # NEWS only contains "see changelog"
 # CHANGES only contains "see NEW"

README

@@ -69,3 +69,6 @@ Blender: X right, Y forwards, Z up
 The exporters perform the needed transform, so in Blender you just work
 with XY plane as ground, and things will appear fine in STK (using XZ
 as ground in the code, obviously).
+
+
+

SVN-CONFIG

@@ -7,7 +7,7 @@
 # with a new config file inside).
 
 [miscellany]
-global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* ._* .DS_Store
+global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* ._* .DS_Store *.blend1 *.blend2
 enable-auto-props = yes
 
 [auto-props]
@@ -30,5 +30,5 @@ Makefile = svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.css = svn:mime-type=text/css
 *.pdf = svn:mime-type=application/pdf
 SConstruct = svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.xml = svn:eol-style=native;svn:mime-type=text/xml
+*.xml = svn:eol-style=LF;svn:mime-type=text/xml
 *.py = svn:eol-style=native;svn:keywords=Author Date Id Revision

cmake/BuildTypeSTKRelease.cmake

@@ -0,0 +1,27 @@
+# Build type STKRelease is similar to Release provided by CMake,
+# but it uses a lower optimization level
+
+set(CMAKE_CXX_FLAGS_STKRELEASE "-O2 -DNDEBUG" CACHE STRING
+    "Flags used by the C++ compiler during STK release builds."
+    FORCE)
+set(CMAKE_C_FLAGS_STKRELEASE "-O2 -DNDEBUG" CACHE STRING
+    "Flags used by the C compiler during STK release builds."
+    FORCE)
+set(CMAKE_EXE_LINKER_FLAGS_STKRELEASE
+    "" CACHE STRING
+    "Flags used for linking binaries during STK release builds."
+    FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS_STKRELEASE
+    "" CACHE STRING
+    "Flags used by the shared libraries linker during STK release builds."
+    FORCE)
+
+mark_as_advanced(
+    CMAKE_CXX_FLAGS_STKRELEASE
+    CMAKE_C_FLAGS_STKRELEASE
+    CMAKE_EXE_LINKER_FLAGS_STKRELEASE
+    CMAKE_SHARED_LINKER_FLAGS_STKRELEASE)
+
+set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
+    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel STKRelease."
+    FORCE)

cmake/FindFribidi.cmake

@@ -0,0 +1,27 @@
+# - Find Fribidi
+# Find the Fribidi includes and libraries
+#
+# Following variables are provided:
+# FRIBIDI_FOUND
+#     True if Fribidi has been found
+# FRIBIDI_INCLUDE_DIRS
+#     The include directories of Fribidi
+# 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 "/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/FindOggVorbis.cmake

@@ -0,0 +1,40 @@
+# - Find OggVorbis
+# Find the OggVorbis includes and libraries
+#
+# Following variables are provided:
+# OGGVORBIS_FOUND
+#     True if OggVorbis has been found
+# OGGVORBIS_INCLUDE_DIRS
+#     The include directories of OggVorbis
+# OGGVORBIS_LIBRARIES
+#     OggVorbis library list
+
+
+find_path(OGGVORBIS_OGG_INCLUDE_DIR NAMES ogg/ogg.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
+find_path(OGGVORBIS_VORBIS_INCLUDE_DIR NAMES vorbis/vorbisfile.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
+find_library(OGGVORBIS_OGG_LIBRARY NAMES ogg Ogg libogg PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+find_library(OGGVORBIS_VORBIS_LIBRARY NAMES vorbis Vorbis libvorbis PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+find_library(OGGVORBIS_VORBISFILE_LIBRARY NAMES vorbisfile libvorbisfile PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
+
+if (APPLE)
+    set(OGGVORBIS_OGG_INCLUDE_DIR "/Library/Frameworks/Ogg.framework/Headers/")
+    set(OGGVORBIS_VORBIS_INCLUDE_DIR "/Library/Frameworks/Vorbis.framework/Headers/")
+endif()
+
+if(APPLE AND NOT OGGVORBIS_VORBISFILE_LIBRARY)
+    # Seems to be the same on Apple systems
+    set(OGGVORBIS_VORBISFILE_LIBRARY ${OGGVORBIS_VORBIS_LIBRARY})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OggVorbis DEFAULT_MSG
+    OGGVORBIS_OGG_INCLUDE_DIR OGGVORBIS_VORBIS_INCLUDE_DIR
+    OGGVORBIS_OGG_LIBRARY OGGVORBIS_VORBIS_LIBRARY OGGVORBIS_VORBISFILE_LIBRARY)
+
+# Publish variables
+set(OGGVORBIS_INCLUDE_DIRS ${OGGVORBIS_OGG_INCLUDE_DIR} ${OGGVORBIS_VORBIS_INCLUDE_DIR})
+set(OGGVORBIS_LIBRARIES ${OGGVORBIS_OGG_LIBRARY} ${OGGVORBIS_VORBIS_LIBRARY} ${OGGVORBIS_VORBISFILE_LIBRARY})
+list(REMOVE_DUPLICATES OGGVORBIS_INCLUDE_DIRS)
+list(REMOVE_DUPLICATES OGGVORBIS_LIBRARIES)
+mark_as_advanced(OGGVORBIS_OGG_INCLUDE_DIR OGGVORBIS_VORBIS_INCLUDE_DIR)
+mark_as_advanced(OGGVORBIS_OGG_LIBRARY OGGVORBIS_VORBIS_LIBRARY OGGVORBIS_VORBISFILE_LIBRARY)

cmake/SourceGroupFunctions.cmake

@@ -0,0 +1,27 @@
+# Generate source groups which mimic the original folder hierarchy.
+# This is mainly useful for MSVC's project explorer
+# - SRCS list of source files
+# - HDRS list of header files
+function(source_group_hierarchy SRCS HDRS)
+    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
+# - FILE path to a file (header or source)
+# - GROUP_PREFIX prefix for group name
+function(source_group_file file group_prefix)
+    get_filename_component(file_path ${file} PATH)
+    if(${file_path} STREQUAL "src")
+        source_group("${group_prefix}" FILES ${file})
+    else()
+        string(REGEX REPLACE "^src/(.*)$" "\\1" group_name ${file_path})
+        string(REPLACE "/" "\\\\" group_name ${group_name})
+        source_group("${group_prefix}${group_name}" FILES ${file})
+    endif()
+endfunction()

configure.ac

@@ -1,6 +1,6 @@
 # Process this file with autogen.sh to produce a configure script.
 
-AC_INIT(supertuxkart,0.7.2)
+AC_INIT(supertuxkart,0.8)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
 AC_PREREQ(2.61)
@@ -192,7 +192,7 @@ if test "x$with_irrlicht" != "x" ; then
    CPPFLAGS="${CPPFLAGS} -I $with_irrlicht/include -I $with_irrlicht/include/irrlicht"
    AC_CHECK_HEADER(irrlicht.h, have_irrlicht_hdr=yes)
    if test x$have_irrlicht_hdr != xyes; then
-      AC_MSG_ERROR([Can't find irrlicht in $with_irrlicht.])
+      AC_MSG_ERROR([Can not find irrlicht in $with_irrlicht.])
    fi
 else
    CPPFLAGS_Save=$CPPFLAGS
@@ -222,7 +222,7 @@ else
        if test x$irrlicht_found_in_usr_local == xyes; then
           with_irrlicht="/usr/local"
        else
-          AC_MSG_ERROR([Can't find irrlicht installation in standard prefixes, use --with-irrlicht...])
+          AC_MSG_ERROR([Can not find irrlicht installation in standard prefixes, use --with-irrlicht...])
        fi
    fi
    
@@ -232,7 +232,7 @@ fi
 
 case "${host}" in
 *-*-linux* )
-  irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht"
+  irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht -lX11 -lpthread"
   ;;
 *darwin*|*macosx*)
   irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht -framework Cocoa"
@@ -286,7 +286,7 @@ case "${host}" in
 esac
   
 if test x$irrlicht_sample_built_fine = xfalse; then
-AC_MSG_ERROR([Can't build test irrLicht program. Check config.log to see the errors])
+AC_MSG_ERROR([Cann not build test irrLicht program. Check config.log to see the errors])
 fi
 
 # ---- Check we have the minimum required irrLicht version
@@ -318,7 +318,7 @@ AC_TRY_RUN(
 if test x$irrlicht_min_version_met = xfalse; then
     AC_MSG_ERROR([Your irrLicht is too old, please update irrLicht. 
 You need irrlicht 1.8.
-While irrlicht 1.8 is not released, we recommend using version 3843 from irrlicht SVN trunk.])
+While irrlicht 1.8 is not released, we recommend using version 3995 from irrlicht SVN trunk.])
 else
     echo "yes"
 fi
@@ -370,8 +370,8 @@ fi
 # Bullet physics
 # ==============
 AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling])
-BULLETTREE="src/bullet"
-bullet_LIBS="-Lbullet/src -lbulletdynamics -lbulletcollision -lbulletmath"
+BULLETTREE="lib/bullet"
+bullet_LIBS="-L../lib/bullet/src -lbulletdynamics -lbulletcollision -lbulletmath"
 
 
 # ====
@@ -399,10 +399,10 @@ case "${host}" in
   enet_LIBS="-Lenet -lenet -lws2_32"
   ;;
 *)
-  enet_LIBS="-Lenet -lenet"
+  enet_LIBS="-L../lib/enet -lenet"
   ;;
 esac
-ENETTREE="src/enet"
+ENETTREE="lib/enet"
 
 # ==========================================
 # Check for a known compiler bug, details in 
@@ -445,15 +445,18 @@ AC_CONFIG_FILES([                   \
  data/models/Makefile               \
  data/music/Makefile                \
  data/po/Makefile                   \
+ data/shaders/Makefile              \
  data/sfx/Makefile                  \
  data/textures/Makefile             \
  data/tracks/Makefile               \
+ data/tutorials/Makefile            \
  doc/Makefile                       \
  src/Makefile                       \
  src/ide/Makefile                   \
- src/bullet/Makefile                \
- src/bullet/src/Makefile            \
- src/enet/Makefile                  \
+ lib/bullet/Makefile                \
+ lib/bullet/src/Makefile            \
+ lib/enet/Makefile                  \
+ tools/Makefile                 
 ])
 AC_OUTPUT
 echo -e $SUMMARY

contrib/README.contrib

@@ -1 +0,0 @@
-In this directory there are unsorted files that can be useful, but aren't used inside the game yet.

contrib/black_closedbook.ac

@@ -1,241 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat3" rgb 0.125 0.114 0.102  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.502 0.502 0.502  shi 10  trans 0
-OBJECT world
-kids 7
-OBJECT poly
-name "box"
-loc -0.9 0.05 -1.05
-numvert 8
--0.7 -0.05 -1.15
--0.7 0.05 -1.15
-0.7 0.05 -1.15
-0.7 -0.05 -1.15
--0.7 -0.05 1.15
--0.7 0.05 1.15
-0.7 0.05 1.15
-0.7 -0.05 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.9 0.35 -1.05
-numvert 8
--0.7 -0.05 -1.15
--0.7 0.05 -1.15
-0.7 0.05 -1.15
-0.7 -0.05 -1.15
--0.7 -0.05 1.15
--0.7 0.05 1.15
-0.7 0.05 1.15
-0.7 -0.05 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.15 0.20203 -1.05
-numvert 8
--0.05 -0.15 -1.15
--0.05 0.15 -1.15
-0.05 0.15 -1.15
-0.05 -0.15 -1.15
--0.05 -0.15 1.15
--0.05 0.15 1.15
-0.05 0.15 1.15
-0.05 -0.15 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
--0.65 -0.1 -1.05
--0.65 0.1 -1.05
-0.65 0.1 -1.05
-0.65 -0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
-0.65 0.1 1.05
-0.65 -0.1 1.05
-0.65 -0.1 -1.05
-0.65 0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 0 1
-1 0 0
-2 1 0
-3 1 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
-0.65 -0.1 1.05
-0.65 0.1 1.05
--0.65 0.1 1.05
--0.65 -0.1 1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
--0.65 -0.1 1.05
--0.65 0.1 1.05
--0.65 0.1 -1.05
--0.65 -0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0

contrib/black_openbook.ac

@@ -1,468 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat3" rgb 0.133 0.153 0.122  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.502 0.502 0.502  shi 10  trans 0
-OBJECT world
-kids 3
-OBJECT poly
-name "box"
-loc 0 1.21271 -1.16783
-numvert 24
-0.889244 1.16215 -0.166283
-0.802644 1.16214 -0.216282
-0.00623977 1.16214 1.05596
-0.0928401 1.16215 1.10596
-0.889247 -1.13786 -0.166282
-0.802644 -1.13786 -0.216282
-0.00624018 -1.13786 1.05597
-0.0928425 -1.13786 1.10597
--0.1 1.16215 1.2173
--0.1 1.16214 1.1173
--1.6 1.16214 1.17089
--1.6 1.16215 1.27088
--0.1 -1.13786 1.2173
--0.1 -1.13786 1.1173
--1.6 -1.13786 1.17089
--1.6 -1.13786 1.27089
-0.166074 1.14416 1.0949
-0.0875697 1.14415 1.04957
--0.17794 1.14415 1.18454
--0.17794 1.14416 1.27519
-0.166069 -1.1711 1.0949
-0.0875686 -1.1711 1.04957
--0.17794 -1.1711 1.18454
--0.17794 -1.1711 1.27518
-numsurf 18
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-SURF 0x10
-mat 1
-refs 4
-8 1 0
-9 1 1
-10 0 1
-11 0 0
-SURF 0x10
-mat 1
-refs 4
-14 0 1
-15 0 0
-11 1 0
-10 1 1
-SURF 0x10
-mat 1
-refs 4
-15 1 0
-14 1 1
-13 0 1
-12 0 0
-SURF 0x10
-mat 1
-refs 4
-12 1 0
-13 1 1
-9 0 1
-8 0 0
-SURF 0x10
-mat 1
-refs 4
-9 0 0
-13 1 0
-14 1 1
-10 0 1
-SURF 0x10
-mat 1
-refs 4
-12 0 0
-8 1 0
-11 1 1
-15 0 1
-SURF 0x10
-mat 1
-refs 4
-16 1 0
-17 1 1
-18 0 1
-19 0 0
-SURF 0x10
-mat 1
-refs 4
-22 0 1
-23 0 0
-19 1 0
-18 1 1
-SURF 0x10
-mat 1
-refs 4
-23 1 0
-22 1 1
-21 0 1
-20 0 0
-SURF 0x10
-mat 1
-refs 4
-20 1 0
-21 1 1
-17 0 1
-16 0 0
-SURF 0x10
-mat 1
-refs 4
-17 0 0
-21 1 0
-22 1 1
-18 0 1
-SURF 0x10
-mat 1
-refs 4
-20 0 0
-16 1 0
-19 1 1
-23 0 1
-kids 0
-OBJECT poly
-name "mesh"
-loc -0.724976 1.1989 -1.28171
-texture "../images/homework.rgb"
-texrep -1 1
-texoff -0.02 0
-numvert 20
-0.247142 -1.08817 1.08951
--0.661664 -1.08817 1.20644
--0.661964 1.08817 1.2081
-0.247142 1.08817 1.0895
-0.413804 1.08817 1.04951
-0.413804 -1.08817 1.04951
-0.580474 -1.08817 1.08424
-0.580474 1.08817 1.08424
-0.733932 1.08817 1.28801
-0.733927 -1.08817 1.28801
-0.189261 -1.08817 1.21685
--0.723994 -1.08817 1.28994
--0.723994 1.08817 1.28994
-0.189261 1.08817 1.21685
-0.390654 1.08816 1.17685
-0.390654 -1.08817 1.17685
-0.638354 -1.08817 1.25788
-0.638354 1.08817 1.25788
-0.666104 1.08817 1.35049
-0.666104 -1.08817 1.35049
-numsurf 19
-SURF 0x10
-mat 0
-refs 3
-0 0.670682 0
-1 0.0430446 0.000216054
-2 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 3
-3 0.670682 1
-0 0.670682 0
-2 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-0 0.670682 0
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 3
-5 0.785785 0
-0 0.670682 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-6 0.900887 0
-5 0.785785 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-7 0.900887 1
-6 0.900887 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-8 1 1
-6 0.900887 0
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 3
-9 1 0
-6 0.900887 0
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-0 0.670682 0
-10 0.630709 0
-11 0 0.000324094
-1 0.0430446 0.000216054
-SURF 0x10
-mat 0
-refs 4
-2 0.0428392 0.999303
-12 0 0.998606
-13 0.630709 1
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-10 0.630709 0
-0 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-3 0.670682 1
-13 0.630709 1
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-5 0.785785 0
-15 0.769795 0
-10 0.630709 0
-0 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-15 0.769795 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-17 0.940861 1
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 4
-8 1 1
-18 0.960026 1
-16 0.940861 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 4
-7 0.900887 1
-17 0.940861 1
-18 0.960026 1
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-9 1 0
-19 0.960026 0
-16 0.940861 0
-6 0.900887 0
-SURF 0x30
-mat 0
-refs 4
-12 0 0.998606
-2 0.0428392 0.999303
-1 0.0430446 0.000216054
-11 0 0.000324094
-kids 0
-OBJECT poly
-name "mesh"
-loc 0.724976 1.20186 -1.33573
-texture "../images/homework.rgb"
-texoff -0.02 0
-numvert 20
--0.142032 1.08817 0.0707934
--0.143624 -1.08816 0.0702209
--0.699298 -1.08816 0.798807
--0.699293 1.08817 0.79881
--0.817265 1.08817 0.923148
--0.817271 -1.08816 0.923144
--0.870526 -1.08816 1.08485
--0.870527 1.08817 1.08485
--0.761829 1.08817 1.31332
--0.761829 -1.08816 1.31332
--0.0401483 -1.08816 0.0579898
--0.560077 -1.08816 0.81235
--0.560073 1.08817 0.812352
--0.0401469 1.08817 0.0579908
--0.695416 1.08817 0.966764
--0.695415 -1.08816 0.966764
--0.749089 -1.08816 1.2218
--0.749085 1.08817 1.2218
--0.682765 1.08817 1.29213
--0.682761 -1.08816 1.29213
-numsurf 19
-SURF 0x10
-mat 0
-refs 3
-0 0.0428392 0.999303
-1 0.0430446 0.000216054
-2 0.670682 0
-SURF 0x10
-mat 0
-refs 3
-0 0.0428392 0.999303
-2 0.670682 0
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 3
-3 0.670682 1
-2 0.670682 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-2 0.670682 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-5 0.785785 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-6 0.900887 0
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 3
-7 0.900887 1
-6 0.900887 0
-8 1 1
-SURF 0x10
-mat 0
-refs 3
-8 1 1
-6 0.900887 0
-9 1 0
-SURF 0x10
-mat 0
-refs 4
-1 0.0430446 0.000216054
-10 0 0.000324094
-11 0.630709 0
-2 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-3 0.670682 1
-12 0.630709 1
-13 0 0.998606
-0 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 4
-2 0.670682 0
-11 0.630709 0
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-12 0.630709 1
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 4
-2 0.670682 0
-11 0.630709 0
-15 0.769795 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 4
-5 0.785785 0
-15 0.769795 0
-16 0.940861 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 4
-7 0.900887 1
-17 0.940861 1
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-18 0.960026 1
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-8 1 1
-18 0.960026 1
-17 0.940861 1
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-19 0.960026 0
-9 1 0
-SURF 0x30
-mat 0
-refs 4
-10 0 0.000324094
-1 0.0430446 0.000216054
-0 0.0428392 0.999303
-13 0 0.998606
-kids 0

contrib/closedbook.ac

@@ -1,241 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat3" rgb 1 0 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-OBJECT world
-kids 7
-OBJECT poly
-name "box"
-loc -0.9 0.05 -1.05
-numvert 8
--0.7 -0.05 -1.15
--0.7 0.05 -1.15
-0.7 0.05 -1.15
-0.7 -0.05 -1.15
--0.7 -0.05 1.15
--0.7 0.05 1.15
-0.7 0.05 1.15
-0.7 -0.05 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.9 0.35 -1.05
-numvert 8
--0.7 -0.05 -1.15
--0.7 0.05 -1.15
-0.7 0.05 -1.15
-0.7 -0.05 -1.15
--0.7 -0.05 1.15
--0.7 0.05 1.15
-0.7 0.05 1.15
-0.7 -0.05 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.15 0.20203 -1.05
-numvert 8
--0.05 -0.15 -1.15
--0.05 0.15 -1.15
-0.05 0.15 -1.15
-0.05 -0.15 -1.15
--0.05 -0.15 1.15
--0.05 0.15 1.15
-0.05 0.15 1.15
-0.05 -0.15 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
--0.65 -0.1 -1.05
--0.65 0.1 -1.05
-0.65 0.1 -1.05
-0.65 -0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
-0.65 0.1 1.05
-0.65 -0.1 1.05
-0.65 -0.1 -1.05
-0.65 0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 0 1
-1 0 0
-2 1 0
-3 1 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
-0.65 -0.1 1.05
-0.65 0.1 1.05
--0.65 0.1 1.05
--0.65 -0.1 1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
--0.65 -0.1 1.05
--0.65 0.1 1.05
--0.65 0.1 -1.05
--0.65 -0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0

contrib/cskeogh/geekopeak.loc

@@ -1,78 +0,0 @@
-#
-# Track itself.
-#
-"geekopeak.ac",0,0,0,0,0,0
-#
-"tree1.ac",0,35,{},90,{},{}
-"tree1.ac",-10,35,{},90,{},{}
-"tree1.ac",-20,35,{},90,{},{}
-"tree1.ac",-30,35,{},90,{},{}
-"tree1.ac",-40,38,{},90,{},{}
-"tree1.ac",-50,38,{},90,{},{}
-"tree1.ac",-60,38,{},90,{},{}
-"tree1.ac",-70,38,{},90,{},{}
-"tree1.ac",-80,40,{},90,{},{}
-"tree1.ac",-90,40,{},90,{},{}
-"tree1.ac",-100,40,{},90,{},{}
-"tree1.ac",-110,40,{},90,{},{}
-"tree1.ac",-120,40,{},90,{},{}
-"tree1.ac",-130,36,{},90,{},{}
-"tree1.ac",-140,36,{},90,{},{}
-#"tree1.ac",-45,-35,{},90,{},{}
-#"tree1.ac",-152,-25,{},180,{},{}
-#"tree1.ac",-50,-90,{},90,{},{}
-#"tree1.ac",-15,-60,{},180,{},{}
-#
-#"roadblock.ac",60,-29,{},0,{},{}
-#"roadcone.ac",58,-33,{},27,{},{}
-#"roadcone.ac",56,-34,{},147,{},{}
-#"roadcone.ac",54,-35,{},47,{},{}
-#"icecreamtruck.ac",70,-30,{},-110,{},{}
-#"mytruck.ac",-60,105,{},-100,{},{}
-#
-#"multisign.ac",26,85,{},-55,{},{}
-#"multisign.ac",110,-90,{},-125,{},{}
-#"tuxsign.ac",-30,80,0,45,0,0
-#"vasign.ac",30,100,0,-90,0,0
-#"susesign.ac",130,-40,5,-90,0,0
-#
-#"explode.ac",0,0,1,0,0,0
-#
-YHERRING,-115,-95
-
-RHERRING,0,25
-
-RHERRING,-60,30
-RHERRING,-60,33
-RHERRING,-60,27
-
-RHERRING,-150,-20
-RHERRING,-150,-40
-RHERRING,-150,-60
-RHERRING,-150,-80
-RHERRING,-150,-100
-
-RHERRING,-30,-110
-RHERRING,-30,-113
-RHERRING,-33,-110
-RHERRING,-33,-113
-
-RHERRING,20,-65
-RHERRING,20,-90
-
-SHERRING,70,-70
-SHERRING,70,-80
-SHERRING,70,-90
-SHERRING,70,-100
-
-GHERRING,0,-30
-GHERRING,5,-30
-GHERRING,-5,-30
-
-GHERRING,-100,-10
-GHERRING,-100,-20
-GHERRING,-100,-30
-GHERRING,-100,-40
-
-MUSIC "mods/tk2.mod"
-

contrib/cskeogh/readme.txt

@@ -1,20 +0,0 @@
-This directory contains the following files:
-tree1.blend
-	A tree, created in blender 2.33a.
-	(1349 Verticies, 708 Faces, 14 Objects.)
-umbrella1.blend
-	An umbrella, created in blender 2.33a.
-	For the beach level(s) of tuxkart.
-	I haven't scaled it to the correct size yet.
-umbrella1.jpg
-	Rendered image of 'umbrealla1.blend'.
-tree1.ac
-	'tree1.blend' in AC format, created by blender's AC3DExport
-	version 2.32-1. Place this file in tuxkart 'model' directory.
-geekopeak.loc
-	An updated 'Geeko's Peak' track location file that includes the
-	'tree1.ac' model. Place this file in tuxkart 'data' directory.
-	Used for testing and demonstration purposes.
-
-Craig Keogh
-<cskeogh@bigpond.net.au>

contrib/drvsorter.rb

@@ -1,37 +0,0 @@
-def dist(p1, p2)
-  return Math.sqrt((p2[0] - p1[0])**2 +(p2[1] - p1[1])**2)
-end
-
-f = File.new("/tmp/test.drv", "r")
-
-points = []
-while !f.eof?
-  line = f.readline()
-  (x, y) = line.scan(/(.*),(.*)/)[0]
-  x = x.to_f
-  y = y.to_f
-  points.push([x, y])
-end
-
-ppoints = points.clone()
-
-p1 = points.pop
-while !points.empty?
-  print p1[0], ", ", p1[1], "\n"
-
-  min_dist = 9999999999
-  min_dist_i = -1
-  points.each_index{|i|
-    p2 = points[i]
-    if (dist(p1, p2) < min_dist) 
-      min_dist = dist(p1, p2)
-      min_dist_i = i
-    end
-  }
-
-  p1 = points[min_dist_i]
-  points.delete_at(min_dist_i)
-end
-print p1[0], ", ", p1[1], "\n"
-
-# EOF #

contrib/lunchbox.ac

@@ -1,324 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat0" rgb 0 0 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-OBJECT world
-kids 2
-OBJECT poly
-name "line"
-loc -0.0499999 1.7 -0.0500001
-texture "./../images/lunchbox.rgb"
-texrep 0.9 0.8
-texoff 0.07 -0.02
-numvert 26
-0.55 -0.6 -1.05
-0.55 -0.884701 2.11252
-0.55 0.884701 2.11252
--0.55 -0.884701 2.11252
--0.55 0.884701 2.11252
--0.55 -0.6 -1.05
-0.55 -1.37782 1.82782
--0.55 -1.37782 1.82782
-0.55 -1.66252 1.3347
--0.55 -1.66252 1.3347
-0.55 -1.66252 -1.3347
--0.55 -1.66252 -1.3347
-0.55 -1.37782 -1.82782
--0.55 -1.37782 -1.82782
-0.55 -0.884701 -2.11252
--0.55 -0.884701 -2.11252
-0.55 0.884701 -2.11252
--0.55 0.884701 -2.11252
-0.55 1.37782 -1.82782
--0.55 1.37782 -1.82782
-0.55 1.66252 -1.3347
--0.55 1.66252 -1.3347
-0.55 1.66252 1.3347
--0.55 1.66252 1.3347
-0.55 1.37782 1.82782
--0.55 1.37782 1.82782
-numsurf 36
-SURF 0x10
-mat 1
-refs 3
-2 0 0.766073
-1 5.64299e-08 0.233928
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-3 1 0
-1 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-3 5.64299e-08 0.233928
-4 0 0.766073
-SURF 0x10
-mat 1
-refs 3
-1 5.64299e-08 0.233928
-6 0.0673843 0.0856234
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-3 0 0
-7 1 0
-6 1 1
-1 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-7 0.0673843 0.0856234
-3 5.64299e-08 0.233928
-SURF 0x10
-mat 1
-refs 3
-6 0.0673843 0.0856234
-8 0.184097 3.5852e-08
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-7 0 0
-9 1 0
-8 1 1
-6 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-9 0.184097 3.5852e-08
-7 0.0673843 0.0856234
-SURF 0x10
-mat 1
-refs 3
-8 0.184097 3.5852e-08
-10 0.815903 7.1704e-08
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-9 0 0
-11 1 0
-10 1 1
-8 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-11 0.815903 7.1704e-08
-9 0.184097 3.5852e-08
-SURF 0x10
-mat 1
-refs 3
-10 0.815903 7.1704e-08
-12 0.932616 0.0856234
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-11 0 0
-13 1 0
-12 1 1
-10 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-13 0.932616 0.0856234
-11 0.815903 7.1704e-08
-SURF 0x10
-mat 1
-refs 3
-12 0.932616 0.0856234
-14 1 0.233928
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-13 0 0
-15 1 0
-14 1 1
-12 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-15 1 0.233928
-13 0.932616 0.0856234
-SURF 0x10
-mat 1
-refs 3
-14 1 0.233928
-16 1 0.766073
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-15 1 0
-17 0 0
-16 0 1
-14 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-17 1 0.766073
-15 1 0.233928
-SURF 0x10
-mat 1
-refs 3
-16 1 0.766073
-18 0.932616 0.914377
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-17 1 0
-19 0 0
-18 0 1
-16 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-19 0.932616 0.914377
-17 1 0.766073
-SURF 0x10
-mat 1
-refs 3
-18 0.932616 0.914377
-20 0.815903 1
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-19 1 0
-21 0 0
-20 0 1
-18 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-21 0.815903 1
-19 0.932616 0.914377
-SURF 0x10
-mat 1
-refs 3
-20 0.815903 1
-22 0.184097 1
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-21 1 0
-23 0 0
-22 0 1
-20 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-23 0.184097 1
-21 0.815903 1
-SURF 0x10
-mat 1
-refs 3
-22 0.184097 1
-24 0.0673842 0.914377
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-23 1 0
-25 0 0
-24 0 1
-22 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-25 0.0673842 0.914377
-23 0.184097 1
-SURF 0x10
-mat 1
-refs 3
-24 0.0673842 0.914377
-2 0 0.766073
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-25 1 0
-4 0 0
-2 0 1
-24 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-4 0 0.766073
-25 0.0673842 0.914377
-kids 0
-OBJECT poly
-name "box"
-loc -0.0499998 3.6 -0.15
-numvert 8
--0.25 0.0999999 1.25
-0.25 0.0999999 1.25
-0.25 0.0999999 -1.25
--0.25 0.0999999 -1.25
--0.25 -0.0999999 1.25
-0.25 -0.0999999 1.25
-0.25 -0.0999999 -1.25
--0.25 -0.0999999 -1.25
-numsurf 6
-SURF 0x0
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x0
-mat 0
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x0
-mat 0
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x0
-mat 0
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x0
-mat 0
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x0
-mat 0
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0

contrib/lunchbox2.ac

@@ -1,322 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat0" rgb 0 0 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-OBJECT world
-kids 2
-OBJECT poly
-name "line"
-loc 0.0500001 1.6 0.25
-texture "./../images/lunchbox2.rgb"
-numvert 26
-0.55 -0.6 -1.05
-0.55 -0.884701 2.11252
-0.55 0.884701 2.11252
--0.55 -0.884701 2.11252
--0.55 0.884701 2.11252
--0.55 -0.6 -1.05
-0.55 -1.37782 1.82782
--0.55 -1.37782 1.82782
-0.55 -1.66252 1.3347
--0.55 -1.66252 1.3347
-0.55 -1.66252 -1.3347
--0.55 -1.66252 -1.3347
-0.55 -1.37782 -1.82782
--0.55 -1.37782 -1.82782
-0.55 -0.884701 -2.11252
--0.55 -0.884701 -2.11252
-0.55 0.884701 -2.11252
--0.55 0.884701 -2.11252
-0.55 1.37782 -1.82782
--0.55 1.37782 -1.82782
-0.55 1.66252 -1.3347
--0.55 1.66252 -1.3347
-0.55 1.66252 1.3347
--0.55 1.66252 1.3347
-0.55 1.37782 1.82782
--0.55 1.37782 1.82782
-numsurf 36
-SURF 0x10
-mat 1
-refs 3
-2 0 0.766073
-1 5.64299e-08 0.233928
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-3 1 0
-1 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-3 5.64299e-08 0.233928
-4 0 0.766073
-SURF 0x10
-mat 1
-refs 3
-1 5.64299e-08 0.233928
-6 0.0673843 0.0856234
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-3 0 0
-7 1 0
-6 1 1
-1 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-7 0.0673843 0.0856234
-3 5.64299e-08 0.233928
-SURF 0x10
-mat 1
-refs 3
-6 0.0673843 0.0856234
-8 0.184097 3.5852e-08
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-7 0 0
-9 1 0
-8 1 1
-6 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-9 0.184097 3.5852e-08
-7 0.0673843 0.0856234
-SURF 0x10
-mat 1
-refs 3
-8 0.184097 3.5852e-08
-10 0.815903 7.1704e-08
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-9 0 0
-11 1 0
-10 1 1
-8 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-11 0.815903 7.1704e-08
-9 0.184097 3.5852e-08
-SURF 0x10
-mat 1
-refs 3
-10 0.815903 7.1704e-08
-12 0.932616 0.0856234
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-11 0 0
-13 1 0
-12 1 1
-10 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-13 0.932616 0.0856234
-11 0.815903 7.1704e-08
-SURF 0x10
-mat 1
-refs 3
-12 0.932616 0.0856234
-14 1 0.233928
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-13 0 0
-15 1 0
-14 1 1
-12 0 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-15 1 0.233928
-13 0.932616 0.0856234
-SURF 0x10
-mat 1
-refs 3
-14 1 0.233928
-16 1 0.766073
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-15 1 0
-17 0 0
-16 0 1
-14 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-17 1 0.766073
-15 1 0.233928
-SURF 0x10
-mat 1
-refs 3
-16 1 0.766073
-18 0.932616 0.914377
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-17 1 0
-19 0 0
-18 0 1
-16 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-19 0.932616 0.914377
-17 1 0.766073
-SURF 0x10
-mat 1
-refs 3
-18 0.932616 0.914377
-20 0.815903 1
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-19 1 0
-21 0 0
-20 0 1
-18 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-21 0.815903 1
-19 0.932616 0.914377
-SURF 0x10
-mat 1
-refs 3
-20 0.815903 1
-22 0.184097 1
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-21 1 0
-23 0 0
-22 0 1
-20 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-23 0.184097 1
-21 0.815903 1
-SURF 0x10
-mat 1
-refs 3
-22 0.184097 1
-24 0.0673842 0.914377
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-23 1 0
-25 0 0
-24 0 1
-22 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-25 0.0673842 0.914377
-23 0.184097 1
-SURF 0x10
-mat 1
-refs 3
-24 0.0673842 0.914377
-2 0 0.766073
-0 0.748519 0.319551
-SURF 0x10
-mat 1
-refs 4
-25 1 0
-4 0 0
-2 0 1
-24 1 1
-SURF 0x10
-mat 1
-refs 3
-5 0.748519 0.319551
-4 0 0.766073
-25 0.0673842 0.914377
-kids 0
-OBJECT poly
-name "box"
-loc 0.0500002 3.5 0.15
-numvert 8
--0.25 0.0999999 1.25
-0.25 0.0999999 1.25
-0.25 0.0999999 -1.25
--0.25 0.0999999 -1.25
--0.25 -0.0999999 1.25
-0.25 -0.0999999 1.25
-0.25 -0.0999999 -1.25
--0.25 -0.0999999 -1.25
-numsurf 6
-SURF 0x0
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x0
-mat 0
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x0
-mat 0
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x0
-mat 0
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x0
-mat 0
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x0
-mat 0
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0

contrib/openbook.ac

@@ -1,468 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat3" rgb 1 0 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-OBJECT world
-kids 3
-OBJECT poly
-name "box"
-loc 0 1.21271 -1.16783
-numvert 24
-0.889244 1.16215 -0.166283
-0.802644 1.16214 -0.216282
-0.00623977 1.16214 1.05596
-0.0928401 1.16215 1.10596
-0.889247 -1.13786 -0.166282
-0.802644 -1.13786 -0.216282
-0.00624018 -1.13786 1.05597
-0.0928425 -1.13786 1.10597
--0.1 1.16215 1.2173
--0.1 1.16214 1.1173
--1.6 1.16214 1.17089
--1.6 1.16215 1.27088
--0.1 -1.13786 1.2173
--0.1 -1.13786 1.1173
--1.6 -1.13786 1.17089
--1.6 -1.13786 1.27089
-0.166074 1.14416 1.0949
-0.0875697 1.14415 1.04957
--0.17794 1.14415 1.18454
--0.17794 1.14416 1.27519
-0.166069 -1.1711 1.0949
-0.0875686 -1.1711 1.04957
--0.17794 -1.1711 1.18454
--0.17794 -1.1711 1.27518
-numsurf 18
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-SURF 0x10
-mat 1
-refs 4
-8 1 0
-9 1 1
-10 0 1
-11 0 0
-SURF 0x10
-mat 1
-refs 4
-14 0 1
-15 0 0
-11 1 0
-10 1 1
-SURF 0x10
-mat 1
-refs 4
-15 1 0
-14 1 1
-13 0 1
-12 0 0
-SURF 0x10
-mat 1
-refs 4
-12 1 0
-13 1 1
-9 0 1
-8 0 0
-SURF 0x10
-mat 1
-refs 4
-9 0 0
-13 1 0
-14 1 1
-10 0 1
-SURF 0x10
-mat 1
-refs 4
-12 0 0
-8 1 0
-11 1 1
-15 0 1
-SURF 0x10
-mat 1
-refs 4
-16 1 0
-17 1 1
-18 0 1
-19 0 0
-SURF 0x10
-mat 1
-refs 4
-22 0 1
-23 0 0
-19 1 0
-18 1 1
-SURF 0x10
-mat 1
-refs 4
-23 1 0
-22 1 1
-21 0 1
-20 0 0
-SURF 0x10
-mat 1
-refs 4
-20 1 0
-21 1 1
-17 0 1
-16 0 0
-SURF 0x10
-mat 1
-refs 4
-17 0 0
-21 1 0
-22 1 1
-18 0 1
-SURF 0x10
-mat 1
-refs 4
-20 0 0
-16 1 0
-19 1 1
-23 0 1
-kids 0
-OBJECT poly
-name "mesh"
-loc -0.724976 1.1989 -1.28171
-texture "../images/homework.rgb"
-texrep -1 1
-texoff -0.02 0
-numvert 20
-0.247142 -1.08817 1.08951
--0.661664 -1.08817 1.20644
--0.661964 1.08817 1.2081
-0.247142 1.08817 1.0895
-0.413804 1.08817 1.04951
-0.413804 -1.08817 1.04951
-0.580474 -1.08817 1.08424
-0.580474 1.08817 1.08424
-0.733932 1.08817 1.28801
-0.733927 -1.08817 1.28801
-0.189261 -1.08817 1.21685
--0.723994 -1.08817 1.28994
--0.723994 1.08817 1.28994
-0.189261 1.08817 1.21685
-0.390654 1.08816 1.17685
-0.390654 -1.08817 1.17685
-0.638354 -1.08817 1.25788
-0.638354 1.08817 1.25788
-0.666104 1.08817 1.35049
-0.666104 -1.08817 1.35049
-numsurf 19
-SURF 0x10
-mat 0
-refs 3
-0 0.670682 0
-1 0.0430446 0.000216054
-2 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 3
-3 0.670682 1
-0 0.670682 0
-2 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-0 0.670682 0
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 3
-5 0.785785 0
-0 0.670682 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-6 0.900887 0
-5 0.785785 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-7 0.900887 1
-6 0.900887 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-8 1 1
-6 0.900887 0
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 3
-9 1 0
-6 0.900887 0
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-0 0.670682 0
-10 0.630709 0
-11 0 0.000324094
-1 0.0430446 0.000216054
-SURF 0x10
-mat 0
-refs 4
-2 0.0428392 0.999303
-12 0 0.998606
-13 0.630709 1
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-10 0.630709 0
-0 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-3 0.670682 1
-13 0.630709 1
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-5 0.785785 0
-15 0.769795 0
-10 0.630709 0
-0 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-15 0.769795 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-17 0.940861 1
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 4
-8 1 1
-18 0.960026 1
-16 0.940861 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 4
-7 0.900887 1
-17 0.940861 1
-18 0.960026 1
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-9 1 0
-19 0.960026 0
-16 0.940861 0
-6 0.900887 0
-SURF 0x30
-mat 0
-refs 4
-12 0 0.998606
-2 0.0428392 0.999303
-1 0.0430446 0.000216054
-11 0 0.000324094
-kids 0
-OBJECT poly
-name "mesh"
-loc 0.724976 1.20186 -1.33573
-texture "../images/homework.rgb"
-texoff -0.02 0
-numvert 20
--0.142032 1.08817 0.0707934
--0.143624 -1.08816 0.0702209
--0.699298 -1.08816 0.798807
--0.699293 1.08817 0.79881
--0.817265 1.08817 0.923148
--0.817271 -1.08816 0.923144
--0.870526 -1.08816 1.08485
--0.870527 1.08817 1.08485
--0.761829 1.08817 1.31332
--0.761829 -1.08816 1.31332
--0.0401483 -1.08816 0.0579898
--0.560077 -1.08816 0.81235
--0.560073 1.08817 0.812352
--0.0401469 1.08817 0.0579908
--0.695416 1.08817 0.966764
--0.695415 -1.08816 0.966764
--0.749089 -1.08816 1.2218
--0.749085 1.08817 1.2218
--0.682765 1.08817 1.29213
--0.682761 -1.08816 1.29213
-numsurf 19
-SURF 0x10
-mat 0
-refs 3
-0 0.0428392 0.999303
-1 0.0430446 0.000216054
-2 0.670682 0
-SURF 0x10
-mat 0
-refs 3
-0 0.0428392 0.999303
-2 0.670682 0
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 3
-3 0.670682 1
-2 0.670682 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-2 0.670682 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-5 0.785785 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-6 0.900887 0
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 3
-7 0.900887 1
-6 0.900887 0
-8 1 1
-SURF 0x10
-mat 0
-refs 3
-8 1 1
-6 0.900887 0
-9 1 0
-SURF 0x10
-mat 0
-refs 4
-1 0.0430446 0.000216054
-10 0 0.000324094
-11 0.630709 0
-2 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-3 0.670682 1
-12 0.630709 1
-13 0 0.998606
-0 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 4
-2 0.670682 0
-11 0.630709 0
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-12 0.630709 1
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 4
-2 0.670682 0
-11 0.630709 0
-15 0.769795 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 4
-5 0.785785 0
-15 0.769795 0
-16 0.940861 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 4
-7 0.900887 1
-17 0.940861 1
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-18 0.960026 1
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-8 1 1
-18 0.960026 1
-17 0.940861 1
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-19 0.960026 0
-9 1 0
-SURF 0x30
-mat 0
-refs 4
-10 0 0.000324094
-1 0.0430446 0.000216054
-0 0.0428392 0.999303
-13 0 0.998606
-kids 0

contrib/plibsign.ac

@@ -1,176 +0,0 @@
-AC3Db
-MATERIAL "" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "" rgb 0.553 0.251 0.251  amb 0.553 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 0  trans 0
-OBJECT world
-kids 2
-OBJECT poly
-name "box"
-loc 1.20452 0.8493 0.567803
-texture "../images/adverts.rgb"
-texrep -0.4 0.22
-texoff -0.58 0
-numvert 4
--7.10453 5.1014 -1.22962
--7.10453 12.0986 -1.22962
-4.89547 12.0986 -1.22962
-4.89547 5.1014 -1.22962
-numsurf 1
-SURF 0x0
-mat 0
-refs 4
-0 0 0
-1 0 1
-2 1 1
-3 1 0
-kids 0
-OBJECT poly
-name "box"
-loc 0.0999994 7.1169 -0.0794191
-texrep -0.4 0.22
-texoff -0.58 0
-numvert 24
--3.44376 -7.731 0.5824
--3.34376 5.7972 0.5824
--3.87616 5.7972 0.5824
--3.97616 -7.731 0.5824
--3.87616 5.7972 0.0500004
--3.97616 -7.731 0.0500004
--3.34376 5.7972 0.0500001
--3.44376 -7.731 0.0500001
-5.99998 -1.1662 -0.049999
-5.99998 5.831 -0.049999
--5.99998 5.831 -0.0499999
--5.99998 -1.1662 -0.0499999
--6 5.831 -0.582399
--6 -1.1662 -0.582399
-6 -1.1662 -0.5824
-6 5.831 -0.5824
-3.85624 -7.731 0.5824
-3.95624 5.7972 0.5824
-3.42384 5.7972 0.5824
-3.32384 -7.731 0.5824
-3.42384 5.7972 0.0500003
-3.32384 -7.731 0.0500003
-3.85624 -7.731 0.0500001
-3.95624 5.7972 0.0500001
-numsurf 17
-SURF 0x0
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x0
-mat 1
-refs 4
-4 0 1
-5 0 0
-3 1 0
-2 1 1
-SURF 0x0
-mat 1
-refs 4
-5 1 0
-4 1 1
-6 0 1
-7 0 0
-SURF 0x0
-mat 1
-refs 4
-7 1 0
-6 1 1
-1 0 1
-0 0 0
-SURF 0x0
-mat 1
-refs 4
-1 0 0
-6 1 0
-4 1 1
-2 0 1
-SURF 0x0
-mat 1
-refs 4
-7 0 0
-0 1 0
-3 1 1
-5 0 1
-SURF 0x0
-mat 1
-refs 4
-8 1 0
-9 1 1
-10 0 1
-11 0 0
-SURF 0x0
-mat 1
-refs 4
-12 0 1
-13 0 0
-11 1 0
-10 1 1
-SURF 0x0
-mat 1
-refs 4
-14 1 0
-15 1 1
-9 0 1
-8 0 0
-SURF 0x0
-mat 1
-refs 4
-9 0 0
-15 1 0
-12 1 1
-10 0 1
-SURF 0x0
-mat 1
-refs 4
-14 0 0
-8 1 0
-11 1 1
-13 0 1
-SURF 0x0
-mat 1
-refs 4
-16 1 0
-17 1 1
-18 0 1
-19 0 0
-SURF 0x0
-mat 1
-refs 4
-20 0 1
-21 0 0
-19 1 0
-18 1 1
-SURF 0x0
-mat 1
-refs 4
-22 1 0
-23 1 1
-17 0 1
-16 0 0
-SURF 0x0
-mat 1
-refs 4
-17 0 0
-23 1 0
-20 1 1
-18 0 1
-SURF 0x0
-mat 1
-refs 4
-22 0 0
-16 1 0
-19 1 1
-21 0 1
-SURF 0x0
-mat 1
-refs 4
-21 1 0
-20 1 1
-23 0 1
-22 0 0
-kids 0

contrib/tv.ac

@@ -1,230 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat0" rgb 0 0 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-OBJECT world
-kids 4
-OBJECT poly
-name "box"
-loc -0.168385 1.225 0.308664
-texture "../images/tv.rgb"
-numvert 8
--0.408137 -1.225 -1.41983
--0.408137 1.225 -1.41983
-1.32739 1.225 0.648488
-1.32739 -1.225 0.648488
--1.32739 -1.225 -0.648488
--1.32739 1.225 -0.648488
-0.408137 1.225 1.41983
-0.408137 -1.225 1.41983
-numsurf 6
-SURF 0x0
-mat 1
-refs 4
-0 0 0
-1 0 1
-2 1 1
-3 1 0
-SURF 0x0
-mat 1
-refs 4
-6 1 1
-7 1 0
-3 1 0
-2 1 1
-SURF 0x0
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x0
-mat 1
-refs 4
-4 0 0
-5 0 1
-1 0 1
-0 0 0
-SURF 0x0
-mat 1
-refs 4
-1 0 1
-5 0 1
-6 1 1
-2 1 1
-SURF 0x0
-mat 1
-refs 4
-4 0 0
-0 0 0
-3 1 0
-7 1 0
-kids 0
-OBJECT poly
-name "box"
-loc -0.168385 -0.15 0.308664
-numvert 8
--0.46009 -0.15 -1.63732
--0.46009 0.15 -1.63732
-1.53255 0.15 0.737418
-1.53255 -0.15 0.737418
--1.53255 -0.15 -0.737418
--1.53255 0.15 -0.737418
-0.46009 0.15 1.63732
-0.46009 -0.15 1.63732
-numsurf 6
-SURF 0x0
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x0
-mat 0
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x0
-mat 0
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x0
-mat 0
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x0
-mat 0
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x0
-mat 0
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc 0.870173 2.6 0.0898512
-numvert 8
-0.7 -0.1 -0.1
-0.7 0.0999999 -0.1
-0.7 0.0999999 0.0999999
-0.7 -0.1 0.0999999
--0.7 -0.1 -0.1
--0.7 0.0999999 -0.1
--0.7 0.0999999 0.1
--0.7 -0.1 0.1
-numsurf 6
-SURF 0x0
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x0
-mat 0
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x0
-mat 0
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x0
-mat 0
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x0
-mat 0
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x0
-mat 0
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc 0.138033 2.525 0.0515489
-numvert 8
--0.791159 -0.125 -1.09844
--0.791159 0.125 -1.09844
-0.944368 0.125 0.969881
-0.944368 -0.125 0.969881
--0.944368 -0.125 -0.969881
--0.944368 0.125 -0.969881
-0.791159 0.125 1.09844
-0.791159 -0.125 1.09844
-numsurf 6
-SURF 0x0
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x0
-mat 0
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x0
-mat 0
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x0
-mat 0
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x0
-mat 0
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x0
-mat 0
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0

contrib/yellow_closedbook.ac

@@ -1,241 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat3" rgb 1 1 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.502 0.502 0.502  shi 10  trans 0
-OBJECT world
-kids 7
-OBJECT poly
-name "box"
-loc -0.9 0.05 -1.05
-numvert 8
--0.7 -0.05 -1.15
--0.7 0.05 -1.15
-0.7 0.05 -1.15
-0.7 -0.05 -1.15
--0.7 -0.05 1.15
--0.7 0.05 1.15
-0.7 0.05 1.15
-0.7 -0.05 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.9 0.35 -1.05
-numvert 8
--0.7 -0.05 -1.15
--0.7 0.05 -1.15
-0.7 0.05 -1.15
-0.7 -0.05 -1.15
--0.7 -0.05 1.15
--0.7 0.05 1.15
-0.7 0.05 1.15
-0.7 -0.05 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.15 0.20203 -1.05
-numvert 8
--0.05 -0.15 -1.15
--0.05 0.15 -1.15
-0.05 0.15 -1.15
-0.05 -0.15 -1.15
--0.05 -0.15 1.15
--0.05 0.15 1.15
-0.05 0.15 1.15
-0.05 -0.15 1.15
-numsurf 6
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
--0.65 -0.1 -1.05
--0.65 0.1 -1.05
-0.65 0.1 -1.05
-0.65 -0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
-0.65 0.1 1.05
-0.65 -0.1 1.05
-0.65 -0.1 -1.05
-0.65 0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 0 1
-1 0 0
-2 1 0
-3 1 1
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
-0.65 -0.1 1.05
-0.65 0.1 1.05
--0.65 0.1 1.05
--0.65 -0.1 1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0
-OBJECT poly
-name "box"
-loc -0.85 0.2 -1.05
-numvert 4
--0.65 -0.1 1.05
--0.65 0.1 1.05
--0.65 0.1 -1.05
--0.65 -0.1 -1.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-kids 0

contrib/yellow_openbook.ac

@@ -1,468 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.5 0.5 0.5  shi 10  trans 0
-MATERIAL "ac3dmat3" rgb 1 1 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.502 0.502 0.502  shi 10  trans 0
-OBJECT world
-kids 3
-OBJECT poly
-name "box"
-loc 0 1.21271 -1.16783
-numvert 24
-0.889244 1.16215 -0.166283
-0.802644 1.16214 -0.216282
-0.00623977 1.16214 1.05596
-0.0928401 1.16215 1.10596
-0.889247 -1.13786 -0.166282
-0.802644 -1.13786 -0.216282
-0.00624018 -1.13786 1.05597
-0.0928425 -1.13786 1.10597
--0.1 1.16215 1.2173
--0.1 1.16214 1.1173
--1.6 1.16214 1.17089
--1.6 1.16215 1.27088
--0.1 -1.13786 1.2173
--0.1 -1.13786 1.1173
--1.6 -1.13786 1.17089
--1.6 -1.13786 1.27089
-0.166074 1.14416 1.0949
-0.0875697 1.14415 1.04957
--0.17794 1.14415 1.18454
--0.17794 1.14416 1.27519
-0.166069 -1.1711 1.0949
-0.0875686 -1.1711 1.04957
--0.17794 -1.1711 1.18454
--0.17794 -1.1711 1.27518
-numsurf 18
-SURF 0x10
-mat 1
-refs 4
-0 1 0
-1 1 1
-2 0 1
-3 0 0
-SURF 0x10
-mat 1
-refs 4
-6 0 1
-7 0 0
-3 1 0
-2 1 1
-SURF 0x10
-mat 1
-refs 4
-7 1 0
-6 1 1
-5 0 1
-4 0 0
-SURF 0x10
-mat 1
-refs 4
-4 1 0
-5 1 1
-1 0 1
-0 0 0
-SURF 0x10
-mat 1
-refs 4
-1 0 0
-5 1 0
-6 1 1
-2 0 1
-SURF 0x10
-mat 1
-refs 4
-4 0 0
-0 1 0
-3 1 1
-7 0 1
-SURF 0x10
-mat 1
-refs 4
-8 1 0
-9 1 1
-10 0 1
-11 0 0
-SURF 0x10
-mat 1
-refs 4
-14 0 1
-15 0 0
-11 1 0
-10 1 1
-SURF 0x10
-mat 1
-refs 4
-15 1 0
-14 1 1
-13 0 1
-12 0 0
-SURF 0x10
-mat 1
-refs 4
-12 1 0
-13 1 1
-9 0 1
-8 0 0
-SURF 0x10
-mat 1
-refs 4
-9 0 0
-13 1 0
-14 1 1
-10 0 1
-SURF 0x10
-mat 1
-refs 4
-12 0 0
-8 1 0
-11 1 1
-15 0 1
-SURF 0x10
-mat 1
-refs 4
-16 1 0
-17 1 1
-18 0 1
-19 0 0
-SURF 0x10
-mat 1
-refs 4
-22 0 1
-23 0 0
-19 1 0
-18 1 1
-SURF 0x10
-mat 1
-refs 4
-23 1 0
-22 1 1
-21 0 1
-20 0 0
-SURF 0x10
-mat 1
-refs 4
-20 1 0
-21 1 1
-17 0 1
-16 0 0
-SURF 0x10
-mat 1
-refs 4
-17 0 0
-21 1 0
-22 1 1
-18 0 1
-SURF 0x10
-mat 1
-refs 4
-20 0 0
-16 1 0
-19 1 1
-23 0 1
-kids 0
-OBJECT poly
-name "mesh"
-loc -0.724976 1.1989 -1.28171
-texture "../images/homework.rgb"
-texrep -1 1
-texoff -0.02 0
-numvert 20
-0.247142 -1.08817 1.08951
--0.661664 -1.08817 1.20644
--0.661964 1.08817 1.2081
-0.247142 1.08817 1.0895
-0.413804 1.08817 1.04951
-0.413804 -1.08817 1.04951
-0.580474 -1.08817 1.08424
-0.580474 1.08817 1.08424
-0.733932 1.08817 1.28801
-0.733927 -1.08817 1.28801
-0.189261 -1.08817 1.21685
--0.723994 -1.08817 1.28994
--0.723994 1.08817 1.28994
-0.189261 1.08817 1.21685
-0.390654 1.08816 1.17685
-0.390654 -1.08817 1.17685
-0.638354 -1.08817 1.25788
-0.638354 1.08817 1.25788
-0.666104 1.08817 1.35049
-0.666104 -1.08817 1.35049
-numsurf 19
-SURF 0x10
-mat 0
-refs 3
-0 0.670682 0
-1 0.0430446 0.000216054
-2 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 3
-3 0.670682 1
-0 0.670682 0
-2 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-0 0.670682 0
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 3
-5 0.785785 0
-0 0.670682 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-6 0.900887 0
-5 0.785785 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-7 0.900887 1
-6 0.900887 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-8 1 1
-6 0.900887 0
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 3
-9 1 0
-6 0.900887 0
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-0 0.670682 0
-10 0.630709 0
-11 0 0.000324094
-1 0.0430446 0.000216054
-SURF 0x10
-mat 0
-refs 4
-2 0.0428392 0.999303
-12 0 0.998606
-13 0.630709 1
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-10 0.630709 0
-0 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-3 0.670682 1
-13 0.630709 1
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-5 0.785785 0
-15 0.769795 0
-10 0.630709 0
-0 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-15 0.769795 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-17 0.940861 1
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 4
-8 1 1
-18 0.960026 1
-16 0.940861 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 4
-7 0.900887 1
-17 0.940861 1
-18 0.960026 1
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-9 1 0
-19 0.960026 0
-16 0.940861 0
-6 0.900887 0
-SURF 0x30
-mat 0
-refs 4
-12 0 0.998606
-2 0.0428392 0.999303
-1 0.0430446 0.000216054
-11 0 0.000324094
-kids 0
-OBJECT poly
-name "mesh"
-loc 0.724976 1.20186 -1.33573
-texture "../images/homework.rgb"
-texoff -0.02 0
-numvert 20
--0.142032 1.08817 0.0707934
--0.143624 -1.08816 0.0702209
--0.699298 -1.08816 0.798807
--0.699293 1.08817 0.79881
--0.817265 1.08817 0.923148
--0.817271 -1.08816 0.923144
--0.870526 -1.08816 1.08485
--0.870527 1.08817 1.08485
--0.761829 1.08817 1.31332
--0.761829 -1.08816 1.31332
--0.0401483 -1.08816 0.0579898
--0.560077 -1.08816 0.81235
--0.560073 1.08817 0.812352
--0.0401469 1.08817 0.0579908
--0.695416 1.08817 0.966764
--0.695415 -1.08816 0.966764
--0.749089 -1.08816 1.2218
--0.749085 1.08817 1.2218
--0.682765 1.08817 1.29213
--0.682761 -1.08816 1.29213
-numsurf 19
-SURF 0x10
-mat 0
-refs 3
-0 0.0428392 0.999303
-1 0.0430446 0.000216054
-2 0.670682 0
-SURF 0x10
-mat 0
-refs 3
-0 0.0428392 0.999303
-2 0.670682 0
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 3
-3 0.670682 1
-2 0.670682 0
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-2 0.670682 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-5 0.785785 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 3
-4 0.785785 1
-6 0.900887 0
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 3
-7 0.900887 1
-6 0.900887 0
-8 1 1
-SURF 0x10
-mat 0
-refs 3
-8 1 1
-6 0.900887 0
-9 1 0
-SURF 0x10
-mat 0
-refs 4
-1 0.0430446 0.000216054
-10 0 0.000324094
-11 0.630709 0
-2 0.670682 0
-SURF 0x10
-mat 0
-refs 4
-3 0.670682 1
-12 0.630709 1
-13 0 0.998606
-0 0.0428392 0.999303
-SURF 0x10
-mat 0
-refs 4
-2 0.670682 0
-11 0.630709 0
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-4 0.785785 1
-14 0.769795 1
-12 0.630709 1
-3 0.670682 1
-SURF 0x10
-mat 0
-refs 4
-2 0.670682 0
-11 0.630709 0
-15 0.769795 0
-5 0.785785 0
-SURF 0x10
-mat 0
-refs 4
-5 0.785785 0
-15 0.769795 0
-16 0.940861 0
-6 0.900887 0
-SURF 0x10
-mat 0
-refs 4
-7 0.900887 1
-17 0.940861 1
-14 0.769795 1
-4 0.785785 1
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-18 0.960026 1
-8 1 1
-SURF 0x10
-mat 0
-refs 4
-8 1 1
-18 0.960026 1
-17 0.940861 1
-7 0.900887 1
-SURF 0x10
-mat 0
-refs 4
-6 0.900887 0
-16 0.940861 0
-19 0.960026 0
-9 1 0
-SURF 0x30
-mat 0
-refs 4
-10 0 0.000324094
-1 0.0430446 0.000216054
-0 0.0428392 0.999303
-13 0 0.998606
-kids 0

data/Makefile.am

@@ -1,17 +1,14 @@
 # data/
 
-SUBDIRS    = challenges fonts gfx gui karts models music po sfx textures tracks grandprix
+SUBDIRS    = challenges fonts gfx gui karts models music po sfx textures tracks \
+             grandprix tutorials shaders
+
 pkgdatadir = $(datadir)/games/$(PACKAGE)/data
 
 dist_pkgdata_DATA = \
- $(shell find $(srcdir) -name "*.data")                  \
- $(shell find $(srcdir) -name "*.items")                 \
- $(shell find $(srcdir) -name "*.projectile")            \
- $(shell find $(srcdir) -name "*.cup")                   \
  $(shell find $(srcdir) -maxdepth 1 -name "*.challenge") \
- $(shell find $(srcdir) -name "*.collectable")           \
  stk_config.xml  powerup.xml  items.xml                  \
- CREDITS
+ CREDITS run_me.sh 
 
 desktopdir = $(prefix)/share/applications
 desktop_DATA = supertuxkart.desktop
@@ -25,4 +22,4 @@ dist_icon_DATA = supertuxkart_32.xpm supertuxkart_64.xpm
 EXTRA_DIST = supertuxkart_desktop.template
 CLEANFILES = supertuxkart.desktop
 supertuxkart.desktop: Makefile supertuxkart_desktop.template
-	sed 's#PREFIX#$(prefix)#' $(srcdir)/supertuxkart_desktop.template >supertuxkart.desktop
+	sed 's#@PREFIX@#$(prefix)#' '$(srcdir)/supertuxkart_desktop.template' >supertuxkart.desktop

data/challenges/alltracks.challenge

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="worldsend"
-    name="Win the At World's End Grand Prix"
-    description="Come first in the At World's End Grand Prix with 3 Expert AI karts."
-    unlock-gp="alltracks"
-    depend-on="islandfollow minestime"
-    major="grandprix"
-    minor="quickrace"
-    gp="atworldsend"
-    difficulty="hard"
-    karts="4"
-    position="1"
-/>
-

data/challenges/atworldsend.challenge

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="islandfollow"
-    name="Follow the Leader on a Desert Island"
-    description="Win a Follow the Leader race with 3 AI karts on a Desert Island."
-    unlock-gp="atworldsend"
-    depend-on="canyon"
-    major="single"
-    minor="followtheleader"
-    track="islandtrack"
-    difficulty="hard"
-    laps="3"
-    karts="4"
-    position="2"
-/>
-
-

data/challenges/canyon.challenge

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="tollway"
-    name="Win a race on Tux Tollway"
-    description="Win a 3 lap race on Tux Tollway against 4 Expert level AI karts."
-    depend-on="lighthousetime tothemoonandbackgp"
-    unlock-track="canyon"
-    major="single"
-    minor="quickrace"
-    track="tuxtollway"
-    difficulty="hard"
-    laps="3"
-    karts="5"
-    position="1"
-/>
-

data/challenges/city.challenge

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

data/challenges/crescentcrossing.challenge

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="energymathclass"
-    name="Collect Nitro in Math Class"
-    description="Finish with at least 10 points of nitro on three laps of Oliver's Math Class in under 55 seconds."
-    unlock-track="crescentcrossing"
-    depend-on="penguinplaygroundgp"
-    major="single"
-    minor="quickrace"
-    track="olivermath"
-    difficulty="hard"
-    laps="3"
-    karts="1"
-    energy="10"
-    time="55"
-/>
-

data/challenges/farm.challenge

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

data/challenges/followtheleader.challenge

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="penguinplaygroundgp"
-    name="Win Penguin Playground Grand Prix"
-    description="Win Penguin Playground Grand Prix with 3 Expert Level AI karts."
-    unlock-mode="FOLLOW_LEADER"
-    major="grandprix"
-    minor="quickrace"
-    gp="penguinplayground"
-    difficulty="hard"
-    karts="4"
-    position="1"
-/>
-

data/challenges/fortmagma.challenge

@@ -1,18 +1,23 @@
 <?xml version="1.0"?>
+<challenge version="2">
+    <track id="fortmagma" laps="3"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="180"/>
     
-<challenge
-    version="1"
-    id="minestime"
-    name="Finish Mines in 3:00"
-    description="Finish 3 laps in mines with 3 expert AI karts in under 3:00 minutes."
-    depend-on="energyxr591"
-    unlock-track="fortmagma"
-    major="single"
-    minor="quickrace"
-    track="mines"
-    difficulty="hard"
-    laps="3"
-    karts="4"
-    time="180"
-/>
+    <hard>
+        <karts number="2" aiIdent="nolok" superPower="nolokBoss"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="2" aiIdent="nolok" superPower="nolokBoss"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="2" aiIdent="nolok" superPower="nolokBoss"/>
+        <requirements position="1"/>
+    </easy>
 
+    <unlock kart="gnu"/>
+    <unlock kart="nolok"/>
+    <unlock track="fortmagma"/>
+</challenge>

data/challenges/gnu.challenge

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="fortmagma"
-    name="Win a race on Fort Magma"
-    description="Win a 3 lap race on Fort Magma against 3 Expert level AI karts."
-    depend-on="worldsend"
-    unlock-kart="gnu"
-    major="single"
-    minor="quickrace"
-    track="fortmagma"
-    difficulty="hard"
-    laps="3"
-    karts="4"
-    position="1"
-/>
-

data/challenges/gp1.challenge

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

data/challenges/gp2.challenge

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

data/challenges/gp3.challenge

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

data/challenges/gp4.challenge

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

data/challenges/hacienda.challenge

@@ -1,17 +1,19 @@
 <?xml version="1.0"?>
+<challenge version="2">
+    <track id="hacienda" laps="3"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="45"/>
     
-<challenge
-    version="1"
-    id="farmtracktime"
-    name="Finish Farm in 2:30"
-    description="Finish 3 laps in Farm with 3 easy AI karts in under 2:30 minutes."
-    unlock-track="hacienda"
-    major="single"
-    minor="quickrace"
-    track="farm"
-    difficulty="easy"
-    laps="3"
-    karts="4"
-    time="150"
-/>
-
+    <hard>
+        <karts number="5"/>
+        <requirements position="2" time="170"/>
+    </hard>
+    <medium>
+        <karts number="4"/>
+        <requirements time="190"/>
+    </medium>
+    <easy>
+        <karts number="4"/>
+        <requirements time="220"/>
+    </easy>
+</challenge>

data/challenges/island.challenge

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="snowmountain"
-    name="Win a race on Snow Mountain"
-    description="Win a 3 lap race on Snow Mountain under 3:05 against 3 medium AI karts."
-    unlock-track="islandtrack"
-    major="single"
-    minor="quickrace"
-    track="snowmountain"
-    difficulty="medium"
-    laps="3"
-    karts="4"
-    time="185"
-/>
-

data/challenges/islandtrack.challenge

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

data/challenges/jungle.challenge

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

data/challenges/lighthouse.challenge

@@ -1,19 +1,20 @@
 <?xml version="1.0"?>
+<challenge version="2">
+    <track id="lighthouse" laps="3"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="135"/>
     
-<challenge
-    version="1"
-    id="starfollow"
-    name="Follow the Leader around the Solar System"
-    description="Win a Follow the Leader race with 5 AI karts on Star track"
-    unlock-track="lighthouse"
-    depend-on="farmtracktime penguinplaygroundgp"
-    major="single"
-    minor="followtheleader"
-    track="startrack"
-    difficulty="medium"
-    laps="3"
-    karts="6"
-    position="2"
-/>
-
+    <hard>
+        <karts number="5"/>
+        <requirements time="90" position="1"/>
+    </hard>
+    <medium>
+        <karts number="4"/>
+        <requirements time="95"/>
+    </medium>
+    <easy>
+        <karts number="3"/>
+        <requirements time="110"/>
+    </easy>
+</challenge>
 

data/challenges/mansion.challenge

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

data/challenges/mines.challenge

@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
+<challenge version="2">
+    <track id="mines" laps="3"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="150"/>
      
-<challenge
-    version="1"
-    id="energyxr591"
-    name="Collect fuel for your rocket"
-    description="Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 minutes."
-    unlock-track="mines"
-    depend-on="lighthousetime canyon"
-    major="single"
-    minor="quickrace"
-    track="xr591"
-    difficulty="hard"
-    karts="1"
-    laps="2"
-    energy="16"
-    time="150"
-/>
-
+    <hard>
+        <karts number="4"/>
+        <requirements time="170"/>
+    </hard>
+    <medium>
+        <karts number="4"/>
+        <requirements time="190"/>
+    </medium>
+    <easy>
+        <karts number="4"/>
+        <requirements time="215"/>
+    </easy>
+</challenge>

data/challenges/minigolf.challenge

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

data/challenges/olivermath.challenge

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

data/challenges/sandtrack.challenge

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<challenge version="2">
+    <track id="sandtrack" laps="3"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="0"/>
+    
+    <hard>
+        <karts number="1"/>
+        <requirements energy="16" time="167"/>
+    </hard>
+    <medium>
+        <karts number="1"/>
+        <requirements energy="12" time="185"/>
+    </medium>
+    <easy>
+        <karts number="1"/>
+        <requirements energy="10" time="220"/>
+    </easy>
+</challenge>

data/challenges/scotland.challenge

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

data/challenges/skyline.challenge

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="gardenhead"
-    name="Win a Head to Head in the Secret Garden"
-    description="Win a 1 lap Head to Head in the Secret Garden against 1 easy level AI kart."
-    depend-on="snowmountain"
-    unlock-track="skyline"
-    major="single"
-    minor="timetrial"
-    track="secretgarden"
-    difficulty="easy"
-    laps="1"
-    karts="2"
-    position="1"
-/>
-

data/challenges/snagdrive.challenge

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="tothemoonandbackgp"
-    name="Win To the Moon and Back Grand Prix"
-    description="Win the To the Moon and Back Grand Prix with 3 Expert Level AI karts."
-    unlock-gp="snagdrive"
-    depend-on="energyshiftingsands starfollow gardenhead"
-    major="grandprix"
-    minor="quickrace"
-    gp="tothemoonandback"
-    difficulty="hard"
-    karts="4"
-    position="1"
-/>
-

data/challenges/snowmountain.challenge

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

data/challenges/snowpeak.challenge

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

data/challenges/startrack.challenge

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

data/challenges/subsea.challenge

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

data/challenges/tollway.challenge

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="lighthousetime"
-    name="Finish Lighthouse in 1:30"
-    description="Finish 3 laps in Lighthouse with 3 Expert AI karts in under 1:30 minutes."
-    unlock-track="tuxtollway"
-    depend-on="starfollow"
-    major="single"
-    minor="quickrace"
-    track="lighthouse"
-    difficulty="hard"
-    laps="3"
-    karts="4"
-    time="90"
-/>
-

data/challenges/tothemoonandback.challenge

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="energyshiftingsands"
-    name="Collect the Pharaohs Treasure"
-    description="Finish with at least 12 nitro points on 3 laps of Shifting Sands in under 2:20 minutes."
-    unlock-gp="tothemoonandback"
-    depend-on="energymathclass farmtracktime"
-    major="single"
-    minor="quickrace"
-    track="sandtrack"
-    difficulty="medium"
-    karts="1"
-    laps="3"
-    energy="12"
-    time="140"
-/>
-

data/challenges/tuxtollway.challenge

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

data/challenges/xr591.challenge

@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
+<challenge version="2">
+    <track id="xr591" laps="2"/>
+    <mode major="single" minor="quickrace"/>
+    <requirements trophies="135"/>
+    
+    <hard>
+        <karts number="1"/>
+        <requirements energy="16" time="135"/>
+    </hard>
+    <medium>
+        <karts number="1"/>
+        <requirements energy="14" time="155"/>
+    </medium>
+    <easy>
+        <karts number="1"/>
+        <requirements energy="12" time="170"/>
+    </easy>
+</challenge>
 
-<challenge
-    version="1"
-    id="canyon"
-    name="Win a race on Canyon"
-    description="Win a 3 lap race on Canyon against 4 Expert level AI karts."
-    depend-on="tollway"
-    unlock-track="xr591"
-    major="single"
-    minor="quickrace"
-    track="canyon"
-    difficulty="hard"
-    laps="3"
-    karts="5"
-    position="1"
-/>
 

data/challenges/zengarden.challenge

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