diff --git a/INSTALL b/INSTALL index 895a551d5..abcd9a790 100644 --- a/INSTALL +++ b/INSTALL @@ -7,8 +7,7 @@ General First, make sure that you have the following packages installed: * OpenGL (or Mesa 3.0 or later) - * PLIB version 1.8.4 or later - * SDL 1.2 or later + * Irrlicht 1.6 * OpenAL Unpack the files from the tarball like this: @@ -36,28 +35,43 @@ location, use the "--prefix" option of configure, e.g. --prefix=/usr See the --help output of configure for further options. -SVN STK on Ubuntu Edgy ----------------------- -Here are the compilation instructions for the current svn(05 oct. 2006) of -Super Tux Kart on Ubuntu Edgy, contributed by Damien: +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 libopenal-dev libmikmod2-dev plib1.8.4-dev +# apt-get install libtool libxxf86vm-dev libopenal-dev libglu1-mesa-dev subversion autoconf automake1.9 g++ gcc do a: -$ svn checkout http://supertuxkart.svn.sourceforge.net/svnroot/supertuxkart/trunk/supertuxkart +$ svn checkout https://supertuxkart.svn.sourceforge.net/svnroot/supertuxkart/main/branches/irrlicht -then: +Get irrlicht-1.6.zip and unzip it, compile irrlicht: +$ cd irrlicht-1.6/source/Irrlicht/ +$ make +$ cd ../../.. +$ pwd +/some/path/ + +then we can move to stk, remember to replace the output of pwd below: $ cd trunk -$ ./autogen.sh && ./configure && make -and if all went well: +$ ./autogen.sh && ./configure --enable-irrlicht --with-irrlicht=/some/path/irrlicht-1.6/ && 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 --enable-irrlicht --with-irrlicht=/some/path/irrlicht-1.6/ && make + But it didn't work! ------------------- @@ -71,15 +85,12 @@ 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 PLIB or +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 you those examples run OK - then go to the PLIB home page and download -the PLIB examples. - -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 +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. diff --git a/README.cygwin b/README.cygwin index f0a81b3c0..3d53482a1 100644 --- a/README.cygwin +++ b/README.cygwin @@ -7,10 +7,7 @@ Some short instruction on how to compile supertuxkart with cygwin: This is part of the cygwin packages, so just select this in the cygwin setup program. -3) Compile and install plib - This should work straight out of the box. - -4) Install OpenAL +3) Install OpenAL We have had some problems with this, so this might be the most difficult stage. 4) Unpack superuxkart and run ./configure and make. @@ -22,8 +19,6 @@ Comments: 1) A -DNOMINMAX is added for cygwin compilations, since otherwise min and max are #defined, causing problems with all std::min and std::max constructs. -2) The order in which plib/pu.h and plib/pw.h are included appears - to be important - pw should be included first. If you have any problems, please post on the mailing list - I am not a regular windows user, so am probably not able to help you. diff --git a/README.macosx b/README.macosx index 9a4707923..0ada0bf45 100644 --- a/README.macosx +++ b/README.macosx @@ -3,10 +3,6 @@ http://supertuxkart.sourceforge.net/Building_and_packaging_on_OSX (*) There is an experimental Xcode project in /src/ide/Xcode/. It will still require that all dependencies are installed as explained on the wiki. The older instructions should still work, and are quite detailed. -Note that we supply a modified version of plib (on our download page -at http://sourceforge.net/project/showfiles.php?group_id=202302) -which fixes a few compilation problems on Macs. We strongly recommend -to use this version (unless a newer plib version is released). System requirements Mac: PowerPC- or Intel-Mac with 800 MHz or more, @@ -78,109 +74,7 @@ if [ "${BASH-no}" != "no" ]; then [ -r /etc/bashrc ] && . /etc/bashrc fi 13.03 Change in the folder Contents:Frameworks. And copy Vorbis.framework and Ogg.framework to :Library:Frameworks. -14. Installing plib: //////////////////////////////////////// - - -14.01 Download PLIB from http://plib.sourceforge.net/download.html - - -14.02 Unpack plib-1.8.4.tar.gz. - - -14.03 Change in the folder PLIB. - - -14.04 Download "pwMacOSX.cxx"-patch from ftp://ftp.berlios.de/pub/supertuxkart/plib_patch_for_osx.zip - - -14.05 Installing pwMacOSX.cxx-patch. - - -14.06 Run ./configure --prefix=<..... Universal/plib_ppc>" in the folder PLIB. - - -e.g.: /Users/christian/Desktop/Universal/plib_ppc. - - -14.07 Modify the plib: - - -jsMacOSX.cxx: - - -#include - - -replace with: - - -#include - - -14.08 jsMacOSX.cxx: - - -static void os_specific_s::elementEnumerator( const void *element, void* vjs) - - -replace with: - - -void os_specific_s::elementEnumerator( const void *element, void* vjs) - - -14.09 make - -14.10 make install - -14.11 make clean - - -14.12 Run "./configure --prefix=<..... Universal/plib_x86>" in the folder PLIB. - -e.g.: /Users/christian/Desktop/Universal/plib_x86. - -14.13 Edit the following Makefiles: - -/Makefile - -/src/Makefile - -/src/fnt/Makefile - -/src/js/Makefile - -/src/net/Makefile - -/src/psl/Makefile - -/src/puAux/Makefile - -/src/pui/Makefile - -/src/pw/Makefile - -/src/sg/Makefile - -/src/sl/Makefile - -/src/ssg/Makefile - -/src/ssgAux/Makefile - -/src/util/Makefile - -replace the line: "CXXFLAGS =" with "CXXFLAGS = -g -O2 -Wall -arch i386" - -14.14 make install - -14.15 Create a universal (multi-architecture) plib: - -lipo -create /Users/christian/Desktop/Universal/plib_ppc/lib/libplibfnt.a /Users/christian/Desktop/Universal/ - -plib_x86/lib/libplibfnt.a -output /usr/lib/libplibfnt.a - -Repeat this step for all libraries. +14. This step is not necessary anymore. 15. Installing Freealut-1.1.0 from OpenAL.org //////////////////// @@ -241,12 +135,7 @@ Libs: -framework OpenAL -L${libdir} -lalut Cflags: -framework OpenAL -I${include 15.09 sudo make install -16. Copy the plib files to "/usr/local": - -16.01 sudo cp /usr/lib/libplib* /usr/local/lib/ - -16.02 sudo cp -R /usr/include/plib /usr/local/include/ - +16. This step is not necessary anymore. Installing SuperTuxKart ////////// diff --git a/README.windows b/README.windows index 3b585043b..fa74bd25a 100644 --- a/README.windows +++ b/README.windows @@ -25,13 +25,10 @@ Cygwin This is part of the cygwin packages, so just select this in the cygwin setup program. -2) Compile and install plib - This should work straight out of the box. - -3) Install OpenAL +2) Install OpenAL We have had some problems with this in the past, so it might be tricky. -4) Unpack supertuxkart and run ./configure and make. +3) Unpack supertuxkart and run ./configure and make. That should be all. @@ -40,8 +37,6 @@ Comments: min and max are #defined, causing problems with all std::min and std::max constructs. This is done automatically by the configure script. -2) The order in which plib/pu.h and plib/pw.h are included appears - to be important - pw should be included first. @@ -55,17 +50,5 @@ The main project file is .../src/ide/vc8/supertuxkart.vcproj, and it includes a sub project for the bullet library. More details can be found in .../src/ide/vc8/README. -You still have to install all dependencies, and: -1) Modify plib: - Best choice would be to use the plib version from our download page, - since it contains all bugfixes that are necessary. The latest - release (1.8.5) might work, if you are using 1.8.4: - In src/ssg/ssgLoadAC.cxx replace: - loader_fd = fopen ( filename, "ra" ) ; - with - loader_fd = fopen ( filename, "r" ) ; - This patch will be submitted to PLIB, but we don't know if and - when it will be applied. - -2) Compile plib (project files for visual c++ are included) +You still have to install all dependencies. diff --git a/SVN-CONFIG b/SVN-CONFIG index 98ea547f5..deef56f2b 100644 --- a/SVN-CONFIG +++ b/SVN-CONFIG @@ -1,10 +1,10 @@ -Please, make sure your SVN client uses something that matches the -following config. Specially the autoprops part, that way new files -will be added with the right settings. Default config for command line -svn is in ~/.subversion/config. If you use SVN for multiple projects -simultaneously, remember you can use different configs, at least in -cmd line (via --config-dir and for example ~/.subversion/supertuxkart/ -with a new config file inside). +# Please, make sure your SVN client uses something that matches the +# following config. Specially the autoprops part, that way new files +# will be added with the right settings. Default config for command line +# svn is in ~/.subversion/config. If you use SVN for multiple projects +# simultaneously, remember you can use different configs, at least in +# cmd line (via --config-dir and for example ~/.subversion/supertuxkart/ +# with a new config file inside). [miscellany] global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store @@ -31,4 +31,4 @@ Makefile = svn:eol-style=native;svn:keywords=Author Date Id Revision *.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 -*.py = svn:eol-style=native;svn:executable;svn:keywords=Author Date Id Revision +*.py = svn:eol-style=native;svn:keywords=Author Date Id Revision diff --git a/configure.ac b/configure.ac index db41acb41..d642a8358 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ AC_PROG_CPP AC_PROG_CXX # This macro defines WORDS_BIGENDIAN if building for a big endian machine. -# This is required by ov_read (Ogg Vorbis) AC_C_BIGENDIAN @@ -41,11 +40,6 @@ dnl Check for `configure' flags dnl =========================== SUMMARY="\nSummary of optional components:\n===============================" -if test "x$with_plib" != "x" ; then - echo "plib prefix is $with_plib" - EXTRA_DIRS="${EXTRA_DIRS} $with_plib" -fi - AC_ARG_ENABLE(debug, [AS_HELP_STRING(--enable-debug, [enable debugging info])]) if test x$enable_debug = xyes; then @@ -69,15 +63,6 @@ else SUMMARY="$SUMMARY\nDisabled compiler optimizations." fi -AC_ARG_ENABLE(irrlicht, [AS_HELP_STRING(--enable-irrlicht, - [enable irrlicht compilation (still early pre-alpha)])],, - enable_irrlicht=false) -if test x$enable_irrlicht = xyes; then - AC_DEFINE([HAVE_IRRLICHT], [1], [enable irrlicht compilation]) - SUMMARY="$SUMMARY\nCompiling for irrlicht - be warned, pre-alpha!!" -fi - - dnl =================== dnl Checks for programs. dnl =================== @@ -117,7 +102,6 @@ case "${host}" in save_LIBS=$LIBS AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ]) - AC_SEARCH_LIBS(gluLookAt, GLU) opengl_LIBS="$LIBS" LIBS=$save_LIBS if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then @@ -195,124 +179,74 @@ LIBS=$save_LIBS AC_LANG_PUSH(C++) -# ============================================== -# Check for "plib" without which we cannot go on -# ============================================== -# specify the plib location -AC_ARG_WITH(plib, [AS_HELP_STRING(--with-plib=PREFIX, - [specify the prefix path to plib])]) -if test "x$with_plib" != "x" ; then - echo "plib prefix is $with_plib" - EXTRA_DIRS="${EXTRA_DIRS} $with_plib" -fi - -AC_CHECK_HEADER(plib/ul.h) -if test "x$ac_cv_header_plib_ul_h" != "xyes"; then - AC_MSG_ERROR([[cannot find useable plib installation. You need to install plib 1.8.4 or newer.]]) -fi - -AC_MSG_CHECKING([for plib 1.8.4 or newer]) -AC_TRY_RUN([ -# include - -# define MIN_PLIB_VERSION 184 - int main() { - if ( PLIB_VERSION < MIN_PLIB_VERSION ) { - return -1; - } - return 0; - } - ], - AC_MSG_RESULT(yes), - [ AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([plib 1.8.4 or later is needed. Please intall it first.])], - AC_MSG_RESULT(yes) -) - - - -dnl ======================= -dnl check for SDL libraries -dnl ======================= -dnl Potentially sdl-config could be used, but apparently that might not -dnl exist on all platforms, so doing the 'classical' test is safer :( -case "${host}" in -*) - dnl default unix style machines - - dnl check for libraries - save_LIBS=$LIBS - AC_SEARCH_LIBS(SDL_Init, SDL, have_SDL_lib=yes) - sdl_LIBS="$LIBS" - LIBS=$save_LIBS - - dnl check for header files - AC_CHECK_HEADER(SDL/SDL.h, have_SDL_hdr=yes) - - if test x$have_SDL_hdr != xyes -o x$have_SDL_lib != xyes; then - AC_MSG_ERROR([Install SDL first...]) - fi - - AC_TRY_RUN([ - # include - int main() { - if ( SDL_VERSION_ATLEAST(1,2,10)) { - return 0; - } - return -1; - } - ], - :, - AC_MSG_WARN([Your SDL version uses deprecated - headers. Please update to version 1.2.10 or higher if possible. - Currently this doesn't affects the game at all.]) - ) - -esac - - dnl =============================== dnl Check for irrlicht (if enabled) dnl =============================== -if test x$enable_irrlicht = xyes; then - AC_ARG_WITH(irrlicht, [AS_HELP_STRING(--with-irrlicht=PREFIX, - [specify the prefix path to irrlicht])]) - if test "x$with_irrlicht" != "x" ; then - CPPFLAGS="${CPPFLAGS} -I$with_irrlicht/include" +AC_ARG_WITH(irrlicht, [AS_HELP_STRING(--with-irrlicht=PREFIX, + [specify the prefix path to irrlicht])]) +if test "x$with_irrlicht" != "x" ; then + CPPFLAGS="${CPPFLAGS} -I $with_irrlicht/include" + 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.]) fi +else + CPPFLAGS_save=CPPFLAGS + CPPFLAGS="${CPPFLAGS} -I /usr/local/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 installation, use --with-irrlicht...]) fi - case "${host}" in - *-*-linux* ) - irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -lIrrlicht" - ;; - *darwin*|*macosx*) - irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht" - ;; - esac - - dnl Test if we need Xxf86vm. For now assume that if any problems - dnl occur with this simple program, it must be caused by this - dnl missing library. FIXME: better tests should be done here!! - dnl FIXME: this program when run prints out two lines (version numbers) to stdout - echo "checking for irrlicht libraries." - save_LIBS=$LIBS - LIBS="$LIBS $irrlicht_LIBS $opengl_LIBS" - AC_TRY_RUN([ - # include "irrlicht.h" - int main() { - irr::createDevice(irr::video::EDT_NULL); - return 0; - } - ], - , - irrlicht_LIBS="$irrlicht_LIBS -lXxf86vm" - ) - LIBS=$save_LIBS - fi +case "${host}" in +*-*-linux* ) + irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -lIrrlicht" + ;; +*darwin*|*macosx*) + irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht" + ;; +*freebsd*) + irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht" +esac + +dnl Test if we need Xxf86vm. For now assume that if any problems +dnl occur with this simple program, it must be caused by this +dnl missing library. FIXME: better tests should be done here!! +dnl FIXME: this program when run prints out two lines (version numbers) to stdout +echo "checking for irrlicht libraries." +save_LIBS=$LIBS +LIBS="$LIBS $irrlicht_LIBS $opengl_LIBS" + +case "${host}" in +*-*-linux* ) + AC_TRY_RUN([ + # include "irrlicht.h" + int main() { + irr::createDevice(irr::video::EDT_NULL); + return 0; + } + ], + , + irrlicht_LIBS="$irrlicht_LIBS -lXxf86vm" + ) + ;; +*darwin*|*macosx*) + AC_TRY_RUN([ + # include "irrlicht.h" + int main() { + irr::createDevice(irr::video::EDT_NULL); + return 0; + } + ], + , + irrlicht_LIBS="$irrlicht_LIBS" + ) + ;; +*freebsd*) + LDFLAGS="$LDFLAGS -lpthread" +esac + +LIBS=$save_LIBS dnl ====================================================== dnl Try to supply the SVN revision number for the compiler @@ -323,21 +257,6 @@ if test x$have_svnversion != xno; then AC_DEFINE_UNQUOTED([SVNVERSION],"$SVNVERSION",["SVN revision number"]) fi -AC_MSG_CHECKING([for gcc -fno-regmove option ]) - -dnl ========================= -dnl test regmove compiler bug -dnl ========================= -dnl Test if -fno-regmove is supported, since -fregmove (which is part of -O2 on -dnl g++) triggers an optimisation problem with static_ssg: -ORIGCXXFLAGS="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS -fno-regmove" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], - AC_MSG_RESULT(yes); NOREGMOVE=-fno-regmove, - AC_MSG_RESULT(no); NOREGMOVE="") -CXXFLAGS="$ORIGCXXFLAGS" -AC_SUBST(NOREGMOVE) - dnl ============================================== dnl Glut (optional), used by bullet debugging only dnl ============================================== @@ -416,27 +335,6 @@ ENETTREE="src/enet" # Check for gettext CHECK_GETTEXT(external) -dnl ======================================================= -dnl Add special compiler flags for SDL on certain platforms -dnl ======================================================= -case "${host}" in -*darwin*|*macosx*) - dnl SDL on Macs needs to link in SDLmain, since it includes the - dnl actual main program (on Macs #include "SDL/SDL.h" renames - dnl main into SDL_main, which then gets called from the new - dnl main program included in SDLmain. This is necessary to - dnl install a proper framework for SDL). - dnl This can't be done earlier, since all SDL tests program - dnl from configure do NOT include SDL/SDL.h, therefore the - dnl main program gets not replaced, and then getting an linking - dnl error about main defined twice :(( - AC_CHECK_PROGS(have_sdl_config,[sdl-config],"no") - if test x$have_sdl_config != xno; then - LDFLAGS="$LDFLAGS `sdl-config --libs`" - CXXFLAGS="$CXXFLAGS `sdl-config --cflags`" - fi -esac - # ========================= # subst bars in Makefile.am # ========================= @@ -447,7 +345,6 @@ AC_SUBST(opengl_LIBS) AC_SUBST(openal_LIBS) AC_SUBST(oggvorbis_LIBS) AC_SUBST(glut_LIBS) -AC_SUBST(sdl_LIBS) AC_SUBST(BULLETTREE) AC_SUBST(ENETTREE) @@ -459,6 +356,7 @@ AC_CONFIG_FILES([ \ data/Makefile \ data/fonts/Makefile \ data/grandprix/Makefile \ + data/gui/Makefile \ data/items/Makefile \ data/karts/Makefile \ data/models/Makefile \ diff --git a/data/CREDITS b/data/CREDITS index 21d21d0ae..59efd945e 100644 --- a/data/CREDITS +++ b/data/CREDITS @@ -1,274 +1,241 @@ -Super TuxKart - SVN -================= -Visit us at http://supertuxkart.sourceforge.net += Super TuxKart = +A Libre Karting Game Featuring Tux & Friends +- Version SVN +- Visit us at http://supertuxkart.sf.net -SuperTuxKart Administrators: ----------------------------- += SuperTuxKart Administrators = Joerg Henrichs (hiker) - Project leader -- Programming +- Lead Programming +- Windows Packaging Marianne Gagnon (Auria) +- Lead Programming - Art director -- Programming +- Mac OS X Packager Constantin Pelikan (conso) +- Add-ons administrator - Art director -- Add-on package administrator -Additional Programming ----------------------- += Additional Programming = Stephen Dunn - Work on Audio -Damien -- Ogg vorbis support - -Yann Leprince (sciyann) -- Improved build system -- Bug fixes - -Patrick Ammann -- OpenAL support -- Bug fixes -- Code cleanup - -Paul Elms (scifly) -- Change resoluton GUI -- Bug fixes - -Robert Schuster -- User settings updates -- Input handling improvements -- SDL port -- Bug fixes +Bug fixes & misc contributions +- Damien +- Yann Leprince (sciyann) +- Robert Schuster +- Patrick Ammann +- Paul Elms (scifly) +- Xapantu -Visual art ----------- +David +- Work on flying items + += Visual art = Minibjorn -- Powerups and baddies : Bowling Ball, Cake, Plunger, Bubblegum, Anchor, Bomb, Gift-box, Nitro-tank (models + icons) +- Powerups and baddies (models + icons) +- (Bowling Ball, Cake, Plunger, Bubblegum, +- Anchor, Bomb, Gift-box, Nitro-tank) - Fire and smoke particles - Puffy kart - Various textures -The BurningWell image collection - -Tobias Beyrer -- Wilber kart -- elePHPant kart -- main menu background (with modifications by Auria and MiniBjorn) - Thomas Oppl - 'Canyon' track - 'City' track - New 'racetrack' track - New banana model -Benjamin Arnaudet -- GNU Kart +Cheleb +- Nolok kart +- Pidgin kart -MacIO -- Cave X arena +Tobias Beyrer +- Wilber kart +- elePHPant kart +GUI Icons +- onyum.com, commissioned by OpenGameArt.org/Bart Kelsey +- yeKcim (Anthony Carré) Ivar ten Cate (Varivar) - Old mine track - Tux Tollway track -Canarix, Andy (Needer) -- 2D art - -Startrack improvements: - Canarix, Andy (Needer) - Conso - Paul Elms (scifly) - -Marianne Gagnon (Auria) -- 'SnowTux peak' track (Based on previous track 'Geeko peak' from original TuxKart) -- 'Shifting sands', 'Around the Lighthouse' and 'On the beach' track improvements -- 'Amazonian Journey' track -- 'Fort Magma' track (based on previous track 'BSOD castle' from original TuxKart) (modified by conso) -- 'Crescent Crossing' track (Based on previous track 'little volcano' from GOTM contributors) -- New icon - -Frederico de Oliveira Linhares -- Hexley the platypus character (modified and arranged with modified Wilber-kart by conso) - -Johannes Sjolund -- 'The Island' track (with modifications by Wayne Dennis (Pixel_2ACF3)) - -Christian Framing -- Updated EvilTux kart +Other art contributions +- Benjamin Arnaudet : GNU kart +- MacIO : Cave X arena +- abejones : Adiumy kart +- Christian Framing (Updated EvilTux kart) +- Andy (Needer) +- Paul Elms (scifly) +- Rudy85 : Character animations Robert Howie - Skyline Track (with modifications by conso) +Elisee +- Checker background + +Marianne Gagnon (Auria) +- 'SnowTux peak' (Based on older 'Geeko peak') +- 'Shifting sands' improvements +- 'Around the Lighthouse' improvements +- 'On the beach' improvements +- 'Amazonian Journey' track +- 'Fort Magma' (based on older 'BSOD castle') +- 'Crescent Crossing' (Based on older 'little volcano') +- New icon + +Frederico de Oliveira Linhares +- Hexley kart character (modified +- to use Wilber-kart by conso) + +Johannes Sjolund +- 'The Island' track (with modifications +- by Wayne Dennis (Pixel_2ACF3)) + Canis Lupus - Snow Mountain track - XR591 track (with modifications by conso) -Music ------ +Other media sources +- BurningWell : public domain photos +- Extreme Tux Racer +- The Glest Jungle Set -Weirwood -- 'Kart grand prix' song - -Lukas Siewert (Dr.Sternhagel) -- 'Caribbean music' song - -Magne Djupvik -- 'Penguin Party' song - -Paul Esra Martin (P@ule) -- 'G4M fan track' song - -Marianne Gagnon (Auria) -- Jungle song - -Matt Thomas -- Boom-boom-boom song - -Chris Leutwyler (kronobil) -- Old mine song -- Snowy track song - -Other music (not specifically created for STK): -- Brad Sucks for 'Out of it' (modified by conso) -- ChillCarrier for 'Druckverlust' -- Deff Syndicate for 'hip hop 1' -- Alessandro Bottura for 'MayDay Mayhem' (modified by conso) -- Speedsound for 'Sky Vibe - High Frequency' -- Daniel Bautista for 'Symphony No. 5' (modified by conso) -- TheDeadRocks for 'GreenSecretFromAmazonia', 'EasyJob', 'OneMillionDollar' - -SFX ---- - -Stephan Wiefling -- Menu sounds - -Misc sound effects : -- Daveincamas -- Radio Mall -- BLASTWAVEFX 02344 -- smcameron -- SmiertSpionem -- Battle For Wesnoth -- FreqMan -- Pogotron -- roscoetoon -- han1 -- lonemonk - -The TORCS project for their engine sound += Music = The Dead Rocks --Easy Job --Green Secret from Amazonia --One Million dollar +- 'GreenSecretFromAmazonia' +- 'EasyJob' +- 'OneMillionDollar' +Misc songs +- Weirwood : 'Kart grand prix' +- Magne Djupvik : 'Penguin Party' +- Paul Esra Martin (P@ule) 'G4M fan track' +- Marianne Gagnon (Auria) : 'Jungle song' +- Matt Thomas : 'Boom-boom-boom song' +- Lukas Siewert (Dr.Sternhagel) : 'Caribbean music' +- Chris Leutwyler (kronobil) : 'Old mine' -Stephen Dunn, based on work by morgantj -- Engine sound +Misc songs +- Chris Leutwyler (kronobil) : 'Snowy track' +- Brad Sucks - 'Out of it' +- ChillCarrier - 'Druckverlust' +- Deff Syndicate - 'hip hop 1' +- Alessandro Bottura - 'MayDay Mayhem' +- Speedsound - 'Sky Vibe Hi Frequency' +- Daniel Bautista - 'Symphony No. 5' -Atheal Washington and Stephen Dunn -- Skidding sound += Sound Effects = -Translations ------------- -German: Dominique Leuenberger (dimstar), Stefan von Halenbach, Constantin Pelikan -French: Marianne Gagnon (Auria), Yann Leprince (sciyann) -Dutch: Frans van Rijn (Asciimonster) -Spanish: David Ballesteros Mayo (Dividio), Samuel (netocp-1) -Italian: Vincenzo (Gigugin) -Swedish: Niklas Grahn (Respit) -Romanian: Marina Muncescu -Portugese: Flávio Zavan (nebososo) -Irish: Aaron Kearns -Finnish : Kristian Laakkonen -Galician : Adrián Chaves Fernández, Proxecto Trasno -Polish: Patryk Wychowaniec (patryk1303) -Czech: Ondřej Hruška (Prasisko) -Catalan : Albert Juhé Lluveras (Aljullu) +Sound effects +- Daveincamas, Radio Mall, BLASTWAVEFX 02344 +- smcameron, SmiertSpionem, lonemonk, han1 +- Pogotron, roscoetoon, FreqMan +- Stephan Wiefling : Menu sounds -Mac OS X port -------------- +Sound effects +- Stephen Dunn & morgantj : engine sound +- Stephen Dunn & Atheal Washington : skidding +- Battle For Wesnoth +- The TORCS project -Marianne Gagnon (Auria) - with additional and/or past involvement from - Cherryprice, Nuke, Florian, JPenguin, TinGamer, Xeno74 += Translations = + +German +- Dominique Leuenberger (dimstar) +- Stefan von Halenbach +- Constantin Pelikan + +French +- Marianne Gagnon (Auria) +- Yann Leprince (sciyann) + +Spanish +- David Ballesteros Mayo (Dividio) +- Samuel (netocp-1) + +Galician +- Adrián Chaves Fernández +- Proxecto Trasno + +More translations +- Dutch : Frans van Rijn (Asciimonster) +- Italian : Vincenzo (Gigugin) +- Swedish : Niklas Grahn (Respit) +- Romanian : Marina Muncescu +- Portugese : Flávio Zavan (nebososo) +- Danish : Joe Dalton + +More translations +- Irish : Aaron Kearns +- Finnish : Kristian Laakkonen +- Polish : Patryk Wychowaniec (patryk1303 / p98) +- Czech : Ondřej Hruška (Prasisko) +- Catalan : Albert Juhé Lluveras (Aljullu) +- Slovenian : mufic + += Misc = + +Website +- Tom Jenkins : skin and layout +- Remy le Guen (Vivelefrat) +- Sebastian Rode +- Hiker, Auria, Conso Testing -------- +- Canarix +- JPenguin +- The Games4Mac Forum Community +- (http://community.games4mac.de) -Canarix, JPenguin +Donations +- Markus Liukka +- Michael Roessner (http://www.retrax.de) +- Phelippeau Rudy (rudy251079) +- Carl Olsson +- Tux_penguin +- OpenGameArt.org -The friendly people at the Games4Mac Forum -Website: http://community.games4mac.de += Previous contributors = +No more active +- Eduardo Hernandez Munoz (Coz) : Former Admin +- Sam Clarke : Windows Installer +- Hans "the farmer" Dzaack : Physics tuning +- Maik Semder (Ikework) : Bug fixes -Webmasters ----------- - -Constantin Pelikan (conso) -- General improvements - -Remy le Guen (Vivelefrat) -- Website improvements - -Sebastian Rode -- STK description on the website - - -Misc ----- - -Hans Dzaack (Hans the farmer) -- Physics tuning - -Markus Liukka -- Donator - -Michael Roessner -Website: http://www.retrax.de -- Donator - -Sam Clarke -- Windows Installer - -Previous contributors (version 0.5 and earlier): ------------------------------------------------- -Eduardo Hernandez Munoz (Coz) (former Co-admin) - -Maik Semder (Ikework) -- Bug fixes - -Canarix -- Original user interface - -Game of the Month, STK version 0.0.0 : - See http://happypenguin.org/forums/viewforum.php?f=21 - Caleb Sawtell - Craig Keogh - Ingo Ruhnke - Jacob Persson - James Gregory - Matthias Braun - Oliver Jeeves - Pascal Giard - Paul Carley - Ricardo Cruz - Willian Padovani Germano +Game of the Month (STK version 0.0) +- Craig Keogh, Ingo Ruhnke, Jacob Persson +- James Gregory, Pascal Giard +- Matthias Braun, Oliver Jeeves +- Paul Carley, Ricardo Cruz, Caleb Sawtell +- Willian Padovani Germano, James Gregory Original Tuxkart ------------------- +- Steve Baker (http://www.sjbaker.org/) +- Oliver Baker -Steve Baker, Oliver Baker -Website: http://www.sjbaker.org/ -- Everything except the music += Thanks for Playing! = +Do not hesistate to contribute! +- Give feedback +- Participate on the community +- Donate +- Make art +- Code a feature +- +- +- +- +- diff --git a/data/Makefile.am b/data/Makefile.am index 0c549d8ed..440d99817 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,6 @@ # data/ -SUBDIRS = fonts items karts models music po sfx textures tracks grandprix +SUBDIRS = fonts gui items karts models music po sfx textures tracks grandprix pkgdatadir = $(datadir)/games/$(PACKAGE)/data dist_pkgdata_DATA = \ @@ -10,6 +10,7 @@ dist_pkgdata_DATA = \ $(shell find $(srcdir) -name "*.cup") \ $(shell find $(srcdir) -maxdepth 1 -name "*.challenge") \ $(shell find $(srcdir) -name "*.collectable") \ + $(shell find $(srcdir) -name "*.projectile") \ CREDITS desktopdir = $(prefix)/share/applications diff --git a/data/anvil.collectable b/data/anvil.collectable index c007ad183..bbf7aab6f 100644 --- a/data/anvil.collectable +++ b/data/anvil.collectable @@ -1,9 +1,9 @@ ;; -*- mode: lisp -*- (tuxkart-collectable - (name "anvil") - (model "anvil.ac") - (icon "anchor-icon.rgb") + (name "anchor") + (mesh "anchor.b3d") + (icon "anchor-icon.png") ) ;; EOF ;; diff --git a/data/bowling.projectile b/data/bowling.projectile index f3dba811f..b8f041578 100644 --- a/data/bowling.projectile +++ b/data/bowling.projectile @@ -4,7 +4,7 @@ (name "Bowling") (model "bowling.ac") (mesh "bowling.b3d") - (icon "bowling-icon.rgb") + (icon "bowling-icon.png") (speed 4.0) (min-height 0.2) ; height above terrain below which a ball is ; started to be pulled up diff --git a/data/bubblegum.projectile b/data/bubblegum.projectile index 32b7aa201..76e33d2e3 100644 --- a/data/bubblegum.projectile +++ b/data/bubblegum.projectile @@ -3,7 +3,7 @@ (tuxkart-collectable (name "Bubble Gum") (model "../items/bubblegum.ac") - (icon "bubblegum-icon.rgb") + (icon "bubblegum-icon.png") (speed 50.0) (min-height 0.3) (max-height 1.0) diff --git a/data/bubblegum.xml b/data/bubblegum.xml new file mode 100644 index 000000000..b503dde70 --- /dev/null +++ b/data/bubblegum.xml @@ -0,0 +1,13 @@ +;; -*- mode: lisp -*- + +(tuxkart-collectable + (name "Bubble Gum") + (mesh "../items/bubblegum.b3d") + (icon "bubblegum-icon.png") + (speed 50.0) + (min-height 0.3) + (max-height 1.0) + (force-updown 20) +) + +;; EOF ;; diff --git a/data/cake.projectile b/data/cake.projectile index 0b99e552b..57bc8f203 100644 --- a/data/cake.projectile +++ b/data/cake.projectile @@ -2,9 +2,8 @@ (tuxkart-collectable (name "cake") - (model "cake.ac") (mesh "cake.b3d") - (icon "cake-icon.rgb") + (icon "cake-icon.png") (speed 50.0) (min-height 0.2) (max-height 1.0) diff --git a/data/followtheleader.challenge b/data/followtheleader.challenge index 99416bfb5..288788ad3 100644 --- a/data/followtheleader.challenge +++ b/data/followtheleader.challenge @@ -1,17 +1,15 @@ -;; -*- mode: lisp -*- + -(challenge - (id "penguinplaygroundgp") - (name _("Win Penguin Playground Grand\nPrix")) - (description _("Win Penguin Playground Grand\nPrix with 3 'Racer' Level AI karts.")) - (unlock-mode "followtheleader" _("Follow the Leader")) - (major "grandprix") - (minor "quickrace") - (gp "penguinplayground") - (difficulty "hard") - (karts 4) - (position 1) -) - -;; EOF ;; + diff --git a/data/fonts/AvantGarde-Demi.txf b/data/fonts/AvantGarde-Demi.txf deleted file mode 100644 index 52c697a2b..000000000 Binary files a/data/fonts/AvantGarde-Demi.txf and /dev/null differ diff --git a/data/fonts/DomesticManners.txf b/data/fonts/DomesticManners.txf deleted file mode 100644 index 4340eb80f..000000000 Binary files a/data/fonts/DomesticManners.txf and /dev/null differ diff --git a/data/fonts/DomesticManners.xml b/data/fonts/DomesticManners.xml new file mode 100644 index 000000000..68e222eb0 --- /dev/null +++ b/data/fonts/DomesticManners.xml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/fonts/DomesticManners0.png b/data/fonts/DomesticManners0.png new file mode 100644 index 000000000..3f74583a9 Binary files /dev/null and b/data/fonts/DomesticManners0.png differ diff --git a/data/fonts/DomesticManners1.png b/data/fonts/DomesticManners1.png new file mode 100644 index 000000000..4603ecca0 Binary files /dev/null and b/data/fonts/DomesticManners1.png differ diff --git a/data/fonts/DomesticMannersLatin1.txf b/data/fonts/DomesticMannersLatin1.txf deleted file mode 100644 index 6e0112bb9..000000000 Binary files a/data/fonts/DomesticMannersLatin1.txf and /dev/null differ diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am index 7ea5eab27..c3ec1de9c 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -2,4 +2,5 @@ pkgdatadir = $(datadir)/games/$(PACKAGE)/data/fonts -dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.txf") +dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.png") \ + $(shell find $(srcdir) -name "*.xml") diff --git a/data/grandprix/alltracks.challenge b/data/grandprix/alltracks.challenge index 802af9cd9..fd5dbdc3c 100644 --- a/data/grandprix/alltracks.challenge +++ b/data/grandprix/alltracks.challenge @@ -1,18 +1,16 @@ -;; -*- mode: lisp -*- + -(challenge - (id "worldsend") - (name _("Win the At World's End\nGrand Prix")) - (description _("Come first in the At World's End\nGrand Prix with 3 'Racer'\nLevel AI karts.")) - (unlock-gp "alltracks") - (depend-on "islandfollow") - (major "grandprix") - (minor "quickrace") - (gp "atworldsend") - (difficulty "hard") - (karts 4) - (position 1) -) - -;; EOF ;; + diff --git a/data/grandprix/atworldsend.challenge b/data/grandprix/atworldsend.challenge index 377698024..cae0d4cc8 100644 --- a/data/grandprix/atworldsend.challenge +++ b/data/grandprix/atworldsend.challenge @@ -1,19 +1,18 @@ -;; -*- mode: lisp -*- + -(challenge - (id "islandfollow") - (name _("Follow the Leader on a\nDesert Island")) - (description _("Win a Follow the Leader race\nwith 3 AI karts\non a Desert Island.")) - (unlock-gp "atworldsend") - (depend-on "tothemoonandbackgp" "tollwayhead2head" "tollwaytime" "citytime") - (major "single") - (minor "followtheleader") - (track "islandtrack") - (difficulty "easy") - (laps 3) - (karts 4) - (position 2) -) + -;; EOF ;; diff --git a/data/grandprix/snagdrive.challenge b/data/grandprix/snagdrive.challenge index ba9448306..c5acd14da 100644 --- a/data/grandprix/snagdrive.challenge +++ b/data/grandprix/snagdrive.challenge @@ -1,18 +1,16 @@ -;; -*- mode: lisp -*- + -(challenge - (id "tothemoonandbackgp") - (name _("Win To the Moon and Back\nGrand Prix")) - (description _("Win the To the Moon and Back\nGrand Prix with 3 'Racer'\nLevel AI karts.")) - (unlock-gp "snagdrive") - (depend-on "energyshiftingsands" "junglefollow") - (major "grandprix") - (minor "quickrace") - (gp "tothemoonandback") - (difficulty "hard") - (karts 4) - (position 1) -) - -;; EOF ;; + diff --git a/data/grandprix/tothemoonandback.challenge b/data/grandprix/tothemoonandback.challenge index c7e451b85..4a24ab465 100644 --- a/data/grandprix/tothemoonandback.challenge +++ b/data/grandprix/tothemoonandback.challenge @@ -1,20 +1,18 @@ -;; -*- mode: lisp -*- + -(challenge - (id "energyshiftingsands") - (name _("Collect the Pharaohs Treasure")) - (description _("Finish with at least 9 nitro \npoints on 3 laps of Shifting Sands\nin under 2:20 minutes.")) - (unlock-gp "tothemoonandback") - (depend-on "energymathclass" "racetracktime") - (major "single") - (minor "quickrace") - (track "sandtrack") - (difficulty "medium") - (karts 1) - (laps 3) - (energy 9) - (time 140) -) - -;; EOF ;; + diff --git a/data/gui/License.txt b/data/gui/License.txt new file mode 100644 index 000000000..6127f7c29 --- /dev/null +++ b/data/gui/License.txt @@ -0,0 +1,21 @@ +All icons come from Open Game Art (art by onyum.com, comissionned by Bart Kelsey) +* options_players & random_kart were tweaked by Marianne Gagnon + + +Except : +main_*.png icons, 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 + +Logo and Logo_slim : under CC-BY-SA 3.0+ by 'rastapax' + +difficulty_*.png icons, released under Creative-Commons BY-SA 3, By Conso (Constantin Pelikan) + +Okolaks font by Gluk, released under Open Font License + +title_font, by Marianne Gagnon (Auria), released under CC-BY-SA 3+ + +==== + +Glass Skin by Auria, under CC-BY-SA 3+ +except background, under CC-BY-SA, by 'elisee' diff --git a/data/gui/Makefile.am b/data/gui/Makefile.am new file mode 100644 index 000000000..a79d7eb6c --- /dev/null +++ b/data/gui/Makefile.am @@ -0,0 +1,12 @@ +# data/gui/ + +pkgdatadir = $(datadir)/games/$(PACKAGE)/data/gui + +nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.png") \ + $(shell find $(srcdir) -name "*.jpg") \ + $(shell find $(srcdir) -name "*.stkgui") \ + $(shell find $(srcdir) -name "*.xml") \ + $(shell find $(srcdir) -name "*.stkskin")\ + License.txt + +EXTRA_DIST = $(nobase_pkgdata_DATA) diff --git a/data/gui/back.png b/data/gui/back.png new file mode 100644 index 000000000..070656e28 Binary files /dev/null and b/data/gui/back.png differ diff --git a/data/gui/challenge.png b/data/gui/challenge.png new file mode 100644 index 000000000..a9d74b571 Binary files /dev/null and b/data/gui/challenge.png differ diff --git a/data/gui/challenges.stkgui b/data/gui/challenges.stkgui new file mode 100644 index 000000000..f4195d991 --- /dev/null +++ b/data/gui/challenges.stkgui @@ -0,0 +1,22 @@ + + +
+ +
+ + + + + + + + + + + +
+ +