Moved supertuxkart branches to new directory.

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

ChangeLog

@@ -1,5 +1,5 @@
-SuperTuxKart 0.6
+SuperTuxKart 0.6 (January 2009)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * New improved physics and kart handling
 * Added sharp turns and nitro speed boost (replacing wheelies and jump)
 * Totally rewrote powerups (plunger, bowling ball, cake, bubblegum) and new look for bananas

README

@@ -40,9 +40,9 @@ Player 1:
   Accelerate : Up arrow
   Brake      : Down arrow
   Use item   : Right control
-  Wheelie    : Right shift
+  Sharp Turn : Right shift
   Rescue     : Backspace
-  Jump       : - (minus key)
+  Nitro      : - (minus key)
   Look back  : Right alt
 
 Player 2:
@@ -50,9 +50,9 @@ Player 2:
   Accelerate : W key
   Brake      : S key
   Use item   : Left control
-  Wheelie    : Left shift
+  Sharp Turn : Left shift
   Rescue     : Q key
-  Jump       : Caps lock
+  Nitro      : Caps lock
   Look back  : Left alt
 
 Player 3:
@@ -60,9 +60,9 @@ Player 3:
   Accelerate : T key
   Brake      : G key
   Use item   : N key
-  Wheelie    : C key
+  Sharp Turn : C key
   Rescue     : R key
-  Jump       : V key
+  Nitro      : V key
   Look back  : N key
 
 Player 4:
@@ -70,9 +70,9 @@ Player 4:
   Accelerate : I key
   Brake      : K key
   Use item   : . key
-  Wheelie    : M key
+  Sharp Turn : M key
   Rescue     : u key
-  Jump       : , key
+  Nitro      : , key
   Look back  : / key
 
 The Escape key pauses the game and shows the race menu.

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autogen.sh to produce a configure script.
 
-AC_INIT(supertuxkart, SVN)
+AC_INIT(supertuxkart, 0.6)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
 AC_PREREQ(2.61)

data/CREDITS

@@ -54,6 +54,9 @@ Robert Schuster
 Visual art
 ----------
 
+Benjamin Arnaudet
+- GNU Kart
+
 Canarix, Andy (Needer)
 - 2D art
 - startrack improvements (modified by conso)
@@ -110,9 +113,6 @@ Music
 Weirwood
 - 'Kart grand prix' song
 
-Asha B.
-- 'Ethereal Spectrum' song
-
 Lukas Siewert (Dr.Sternhagel)
 - 'Caribbean music' song
 
@@ -127,8 +127,9 @@ Marianne Gagnon (Auria)
 
 Matt Thomas
 - Boom-boom-boom song
-- TK2 song
+
-- TK5 song
+Chris Leutwyler (kronobil)
+- Old mine song
 
 Other music (not specifically created for STK):
 - Brad Sucks for 'Out of it' (modified by conso)
@@ -137,6 +138,7 @@ Other music (not specifically created for STK):
 - 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
 ---
@@ -184,6 +186,7 @@ Portugese: Flávio Zavan (nebososo)
 Irish: Aaron Kearns
 Finnish : Kristian Laakkonen
 Galician : Adrián Chaves Fernández, Proxecto Trasno
+Polish:  Patryk Wychowaniec (patryk1303)
 
 Mac OS X port
 -------------

data/po/fr.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-13 15:03+1100\n"
-"PO-Revision-Date: 2009-01-13 11:16-0500\n"
+"PO-Revision-Date: 2009-01-21 17:10-0500\n"
 "Last-Translator: Marianne Gagnon (Auria) <auria.mg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -521,7 +521,8 @@ msgid ""
 "now available"
 msgstr ""
 "Nouvelle difficulté\n"
-"'%s' déverrouillée"
+"'%s'\n"
+"déverrouillée"
 
 #: src/modes/linear_world.cpp:286
 msgid "New fastest lap"
@@ -556,7 +557,8 @@ msgid ""
 "now available"
 msgstr ""
 "Nouvelle piste\n"
-"'%s' déverrouillée"
+"'%s'\n"
+"déverrouillée"
 
 #: src/gui/help_page_one.cpp:156
 #: src/gui/help_page_two.cpp:134

data/po/nl.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-16 15:52+1100\n"
+"POT-Creation-Date: 2009-01-13 15:03+1100\n"
-"PO-Revision-Date: 2008-12-20 19:01-0500\n"
+"PO-Revision-Date: 2009-01-20 00:01+0100\n"
-"Last-Translator: Marianne Gagnon (Auria) <auria.mg@gmail.com>\n"
+"Last-Translator: Asciimonster <asciimonster@myrealbox.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/gui/config_display.cpp:387
+#: src/gui/config_display.cpp:395
 #, c-format
 msgid "%dx%d Blacklisted"
 msgstr "%dx%d op Verbanningslijst"
@@ -71,11 +71,11 @@ msgstr "Tocht door de Amazone"
 msgid "Anvil - slows down greatly the kart in the first position"
 msgstr "Aambeeld – Remt de kart in leidende positie af"
 
-#: src/gui/config_display.cpp:94
+#: src/gui/config_display.cpp:99
 msgid "Apply "
 msgstr "Toepassen"
 
-#: src/gui/config_display.cpp:353
+#: src/gui/config_display.cpp:361
 #, c-format
 msgid "Apply %dx%d"
 msgstr "Toepassen %dx%d"
@@ -92,7 +92,7 @@ msgstr "Het einde van de wereld"
 msgid "Avoid bananas"
 msgstr "Vermijd bananen"
 
-#: src/gui/grand_prix_ending.cpp:157
+#: src/gui/grand_prix_ending.cpp:138
 #: src/gui/race_results_gui.cpp:70
 msgid "Back to the main menu"
 msgstr "Terug naar het hoofdmenu"
@@ -139,7 +139,7 @@ msgstr "Kan niet verbinden met server"
 msgid "Canyon"
 msgstr "Het ravijn"
 
-#: src/gui/main_menu.cpp:62
+#: src/gui/main_menu.cpp:61
 msgid "Challenges"
 msgstr "Uitdagingen"
 
@@ -152,7 +152,7 @@ msgstr "Stel de toetsen in, %s"
 msgid "City"
 msgstr "In de stad"
 
-#: src/gui/config_display.cpp:99
+#: src/gui/config_display.cpp:104
 msgid "Clear from Blacklist"
 msgstr "Verwijderen uit verbanningslijst"
 
@@ -206,7 +206,7 @@ msgid "Connected:"
 msgstr "Verbonden:"
 
 #: src/gui/feature_unlocked.cpp:48
-#: src/gui/grand_prix_ending.cpp:153
+#: src/gui/grand_prix_ending.cpp:134
 #: src/gui/race_results_gui.cpp:59
 msgid "Continue"
 msgstr "Doorgaan"
@@ -234,7 +234,7 @@ msgstr ""
 "Ontworpen door Oliver & Steve Baker,\n"
 "aangepast door Marianne Gagnon"
 
-#: src/gui/main_menu.cpp:72
+#: src/gui/main_menu.cpp:78
 msgid "Credits"
 msgstr "Auteurs"
 
@@ -243,16 +243,16 @@ msgid "Crescent Crossing"
 msgstr "Krakend Kerkhof"
 
 #. I18N: displays current resolution
-#: src/gui/config_display.cpp:85
+#: src/gui/config_display.cpp:89
 #, c-format
 msgid "Current: %dx%d"
 msgstr "Huidig: %dx%d"
 
-#: src/gui/config_display.cpp:91
+#: src/gui/config_display.cpp:96
 msgid "Decrease Resolution"
 msgstr "Verlaag resolutie"
 
-#: src/gui/race_options.cpp:86
+#: src/gui/race_options.cpp:84
 msgid "Difficulty"
 msgstr "Niveau"
 
@@ -260,11 +260,11 @@ msgstr "Niveau"
 msgid "Display"
 msgstr "Grafisch"
 
-#: src/gui/config_display.cpp:55
+#: src/gui/config_display.cpp:58
 msgid "Display Settings"
 msgstr "Grafische instellingen"
 
-#: src/gui/race_options.cpp:304
+#: src/gui/race_options.cpp:326
 msgid "Driver"
 msgstr "Chauffeur"
 
@@ -300,10 +300,10 @@ msgstr ""
 msgid ""
 "Finish 3 laps on the Tux Tollway\n"
 "track with 3 AI karts\n"
-"in under 3:00 minutes."
+"in under 3:35 minutes."
 msgstr ""
 "Rij 3 ronden over de \n"
-"Tolweg binnen 1:15 \n"
+"Tolweg binnen 3:35 \n"
 "met 3 tegenstanders"
 
 #: data/tracks/jungle/jungle.challenge:5
@@ -311,8 +311,8 @@ msgid "Finish Race track in 2:40"
 msgstr "Voltooi het racecircuit binnen 2:40"
 
 #: data/tracks/canyon/canyon.challenge:5
-msgid "Finish Tux Tollway track in 3:00"
+msgid "Finish Tux Tollway track in 3:35"
-msgstr "Doe de tolweg binnen 3 minuten"
+msgstr "Doe de tolweg binnen 3 minuten en 35 seconden"
 
 #: data/tracks/snowtuxpeak/snowtuxpeak.challenge:5
 msgid "Finish the City track in 4:20"
@@ -325,10 +325,10 @@ msgid ""
 "in under 2:20 minutes."
 msgstr ""
 "Verzamel binnen 2 minuut 20 \n"
-"ten minste 9 munten op 3 \n"
+"ten minste 9 vaten lachgas op 3 \n"
 "ronden van 'de Zandduinen'"
 
-#: src/gui/race_gui.cpp:677
+#: src/gui/race_gui.cpp:685
 #, c-format
 msgid "Finished"
 msgstr "Klaar"
@@ -394,9 +394,9 @@ msgstr "Fort magma"
 msgid "Four Players"
 msgstr "Vier spelers"
 
-#: src/gui/config_display.cpp:77
+#: src/gui/config_display.cpp:80
-#: src/gui/config_display.cpp:130
+#: src/gui/config_display.cpp:135
-#: src/gui/config_display.cpp:185
+#: src/gui/config_display.cpp:193
 msgid "Fullscreen mode"
 msgstr "Volledig scherm"
 
@@ -408,13 +408,13 @@ msgstr "Spelvorm informatie"
 msgid "Game modes"
 msgstr "Spelvormen"
 
-#: src/gui/challenges_menu.cpp:54
+#: src/gui/challenges_menu.cpp:55
 #: src/gui/credits_menu.cpp:79
 msgid "Go back to the main menu"
 msgstr "Terug naar het hoofdmenu"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/gui/race_gui.cpp:828
+#: src/gui/race_gui.cpp:836
 msgid "Go!"
 msgstr "Af!"
 
@@ -436,7 +436,7 @@ msgstr ""
 "eindigen in de groep. De beste over alle parcoursen wit! \n"
 "(Bij gelijkspel geldt de laaste totaaltijd)"
 
-#: src/gui/main_menu.cpp:69
+#: src/gui/main_menu.cpp:75
 #: src/gui/race_menu.cpp:49
 msgid "Help"
 msgstr "Hulp"
@@ -453,16 +453,16 @@ msgstr ""
 "Het icoontje van een slot geeft aan dat je een uitdaging\n"
 " moet winnen voordat deze optie actief wordt."
 
-#: src/gui/config_display.cpp:89
+#: src/gui/config_display.cpp:94
 msgid "Increase Resolution"
 msgstr "Verhoog resolutie"
 
-#: src/user_config.cpp:870
+#: src/user_config.cpp:1004
 #, c-format
 msgid "Invalid"
 msgstr "Ongeldig"
 
-#: src/modes/linear_world.cpp:171
+#: src/karts/player_kart.cpp:365
 msgid "Invalid short-cut!!"
 msgstr "Niet afsteken!!"
 
@@ -470,7 +470,7 @@ msgstr "Niet afsteken!!"
 msgid "King Weird's Castle"
 msgstr "Het Krankioreme Kasteel van de Koning"
 
-#: src/gui/race_gui.cpp:682
+#: src/gui/race_gui.cpp:690
 msgid "Lap"
 msgstr "Ronde"
 
@@ -487,7 +487,7 @@ msgstr "Leider"
 msgid "Left"
 msgstr "Links"
 
-#: src/gui/race_results_gui.cpp:301
+#: src/gui/race_results_gui.cpp:303
 #: src/gui/start_race_feedback.cpp:86
 msgid "Loading race..."
 msgstr "Bezig met het laden..."
@@ -497,7 +497,7 @@ msgstr "Bezig met het laden..."
 msgid "Look back"
 msgstr "Achteruit kijken"
 
-#: src/gui/main_menu.cpp:59
+#: src/gui/main_menu.cpp:58
 msgid "Networking"
 msgstr "Netwerk"
 
@@ -505,7 +505,7 @@ msgstr "Netwerk"
 msgid "New Feature Unlocked"
 msgstr "Nieuwe optie geactiveerd"
 
-#: src/challenges/challenge.cpp:133
+#: src/challenges/challenge.cpp:136
 #, c-format
 msgid ""
 "New Grand Prix '%s'\n"
@@ -514,7 +514,7 @@ msgstr ""
 "Grand Prix '%s'\n"
 "is nu beschikbaar!"
 
-#: src/challenges/challenge.cpp:136
+#: src/challenges/challenge.cpp:140
 #, c-format
 msgid ""
 "New difficulty\n"
@@ -525,11 +525,11 @@ msgstr ""
 "'%s'\n"
 "is nu beschikbaar!"
 
-#: src/modes/linear_world.cpp:339
+#: src/modes/linear_world.cpp:286
 msgid "New fastest lap"
 msgstr "Nieuwe snelste ronde"
 
-#: src/challenges/challenge.cpp:130
+#: src/challenges/challenge.cpp:131
 #, c-format
 msgid ""
 "New game mode\n"
@@ -539,7 +539,7 @@ msgstr ""
 "Nieuwe spelvorm\n"
 "'%s'is nu beschikbaar!"
 
-#: src/challenges/challenge.cpp:140
+#: src/challenges/challenge.cpp:144
 #, c-format
 msgid ""
 "New kart\n"
@@ -549,7 +549,7 @@ msgstr ""
 "Nieuwe kart '%s'\n"
 "is nu beschikbaar!"
 
-#: src/challenges/challenge.cpp:126
+#: src/challenges/challenge.cpp:127
 #, c-format
 msgid ""
 "New track '%s'\n"
@@ -563,6 +563,10 @@ msgstr ""
 msgid "Next >"
 msgstr "Volgende >"
 
+#: src/gui/config_display.cpp:84
+msgid "Next background"
+msgstr "Volgende achtergrond"
+
 #: src/gui/player_controls.cpp:72
 msgid "Nitro"
 msgstr "Lachgas"
@@ -572,16 +576,16 @@ msgstr "Lachgas"
 msgid "No Grand Prix selected"
 msgstr "Geen Grand Prix geselecteerd"
 
-#: src/gui/race_options.cpp:303
+#: src/gui/race_options.cpp:325
-#: src/gui/race_options.cpp:306
+#: src/gui/race_options.cpp:328
 msgid "Novice"
 msgstr "Beginneling"
 
-#: src/gui/race_options.cpp:102
+#: src/gui/race_options.cpp:100
 msgid "Number of karts"
 msgstr "Kies het aantal karts"
 
-#: src/gui/race_options.cpp:124
+#: src/gui/race_options.cpp:122
 msgid "Number of laps"
 msgstr "Kies het aantal ronden"
 
@@ -590,7 +594,7 @@ msgstr "Kies het aantal ronden"
 msgid "OK"
 msgstr "OK"
 
-#: src/user_config.cpp:498
+#: src/user_config.cpp:528
 msgid "Old config file found, check your key bindings!"
 msgstr "Oud configuratiebestand gevonden, controleer toetsinstellingen!"
 
@@ -602,7 +606,7 @@ msgstr "De wiskundeklas van Olivier"
 msgid "On the Beach"
 msgstr "Strandvakantie"
 
-#: src/gui/main_menu.cpp:64
+#: src/gui/main_menu.cpp:63
 #: src/gui/options.cpp:40
 #: src/gui/race_menu.cpp:48
 msgid "Options"
@@ -616,7 +620,7 @@ msgstr "Parachute – remt alle karts voor je af!"
 msgid "Paused"
 msgstr "Gepauzeerd"
 
-#: src/gui/race_gui.cpp:857
+#: src/gui/race_gui.cpp:865
 msgid "Penalty time!!"
 msgstr "Straftijd!!"
 
@@ -625,7 +629,7 @@ msgid "Penguin Playground"
 msgstr "Speeltuin voor pinguïns"
 
 #. I18N: as in 'Player 2'
-#: src/gui/player_controls.cpp:264
+#: src/gui/player_controls.cpp:290
 msgid "Player "
 msgstr "Speler"
 
@@ -676,7 +680,7 @@ msgid "Press <ESC> to Cancel"
 msgstr "Druk op <ESC> om te annuleren"
 
 #: src/gui/config_controls.cpp:53
-#: src/gui/config_display.cpp:103
+#: src/gui/config_display.cpp:108
 #: src/gui/config_sound.cpp:64
 #: src/gui/game_mode.cpp:158
 #: src/gui/grand_prix_select.cpp:80
@@ -684,7 +688,7 @@ msgstr "Druk op <ESC> om te annuleren"
 #: src/gui/num_players.cpp:46
 #: src/gui/options.cpp:58
 #: src/gui/player_controls.cpp:124
-#: src/gui/race_options.cpp:154
+#: src/gui/race_options.cpp:152
 msgid "Press <ESC> to go back"
 msgstr "Druk op <ESC> om terug te keren"
 
@@ -701,18 +705,14 @@ msgstr "Instant wedstrijd"
 msgid "Quick race: Pick a single track, shortest time wins.         "
 msgstr "Snelle race: Één enkel parcours, snelste tijd wint"
 
-#: src/gui/main_menu.cpp:65
+#: src/gui/main_menu.cpp:64
 msgid "Quit"
 msgstr "Einde"
 
-#: src/gui/race_gui.cpp:629
+#: src/gui/race_gui.cpp:637
 msgid "REV"
 msgstr "R"
 
-#: data/tracks/race/race.track:4
-msgid "Race Track"
-msgstr "Racecircuit"
-
 #: src/gui/race_results_gui.cpp:74
 msgid "Race in this track again"
 msgstr "Doe dit parcours opnieuw"
@@ -721,7 +721,7 @@ msgstr "Doe dit parcours opnieuw"
 msgid "Race results"
 msgstr "Wedstrijdresultaat"
 
-#: src/gui/race_options.cpp:305
+#: src/gui/race_options.cpp:327
 msgid "Racer"
 msgstr "Coureur"
 
@@ -730,7 +730,7 @@ msgid "Racetrack"
 msgstr "Racecircuit"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/gui/race_gui.cpp:808
+#: src/gui/race_gui.cpp:816
 msgid "Ready!"
 msgstr "Op uw plaatsen?"
 
@@ -760,7 +760,7 @@ msgid "Select network mode"
 msgstr "Kies netwerk type"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/gui/race_gui.cpp:818
+#: src/gui/race_gui.cpp:826
 msgid "Set!"
 msgstr "Klaar?"
 
@@ -777,7 +777,7 @@ msgstr "Korte bocht"
 msgid "Shifting Sands"
 msgstr "De zandduinen"
 
-#: src/gui/main_menu.cpp:54
+#: src/gui/main_menu.cpp:53
 msgid "Single Player"
 msgstr "Enkele speler"
 
@@ -809,7 +809,7 @@ msgstr "Geluid"
 msgid "Sound Settings"
 msgstr "Geluid instellingen"
 
-#: src/gui/main_menu.cpp:55
+#: src/gui/main_menu.cpp:54
 msgid "Splitscreen"
 msgstr "Gesplitst scherm"
 
@@ -817,7 +817,7 @@ msgstr "Gesplitst scherm"
 msgid "Star Track"
 msgstr "Tussen de sterren"
 
-#: src/gui/race_options.cpp:144
+#: src/gui/race_options.cpp:142
 msgid "Start race"
 msgstr "Start wedstrijd"
 
@@ -825,7 +825,7 @@ msgstr "Start wedstrijd"
 msgid "Synchronising network..."
 msgstr "Netwerk synchoniseren..."
 
-#: src/gui/race_results_gui.cpp:271
+#: src/gui/race_results_gui.cpp:273
 msgid "Synchronising."
 msgstr "Synchroniseren."
 
@@ -861,7 +861,7 @@ msgstr ""
 msgid "The old mine"
 msgstr "De oude mijn"
 
-#: src/gui/grand_prix_ending.cpp:111
+#: src/gui/grand_prix_ending.cpp:84
 #, c-format
 msgid "The winner is %s!"
 msgstr "De winnar is %s!"
@@ -911,7 +911,7 @@ msgstr "Muziek aan"
 msgid "Turn on sound effects"
 msgstr "Geluidseffecten aan"
 
-#: data/tracks/tuxtrack/tuxtrack.track:4
+#: data/tracks/tuxtollway/tuxtollway.track:4
 msgid "Tux Tollway"
 msgstr "Tolweg van Tux"
 
@@ -919,7 +919,7 @@ msgstr "Tolweg van Tux"
 msgid "Two Players"
 msgstr "Twee spelers"
 
-#: src/modes/linear_world.cpp:278
+#: src/modes/linear_world.cpp:654
 msgid "WRONG WAY!"
 msgstr "VERKEERDE RICHTING!"
 
@@ -1014,7 +1014,7 @@ msgstr ""
 "maan' met drie tegenstandes \n"
 "op 'Coureur' niveau"
 
-#: src/gui/config_display.cpp:72
+#: src/gui/config_display.cpp:75
 msgid "Window mode"
 msgstr "In venster"
 
@@ -1022,7 +1022,7 @@ msgstr "In venster"
 msgid "XR591"
 msgstr "XR591"
 
-#: src/karts/player_kart.cpp:267
+#: src/karts/player_kart.cpp:303
 msgid "You finished the race!"
 msgstr "Race afgelopen!"
 
@@ -1034,7 +1034,7 @@ msgstr ""
 "Je bent\n"
 "geëlimineerd!"
 
-#: src/karts/player_kart.cpp:267
+#: src/karts/player_kart.cpp:303
 msgid "You won the race!"
 msgstr "Je hebt de race gewonnen!"
 
@@ -1042,34 +1042,37 @@ msgstr "Je hebt de race gewonnen!"
 msgid "Zipper - speed boost"
 msgstr "Pijltje – extra snelheid"
 
-#: src/user_config.cpp:853
+#: src/user_config.cpp:986
 #, c-format
 msgid "joy %d axis %d  %c"
 msgstr "joystick %d as %d  %c"
 
-#: src/user_config.cpp:857
+#: src/user_config.cpp:991
 #, c-format
 msgid "joy %d btn %d"
 msgstr "joystick %d knop %d"
 
-#: src/user_config.cpp:860
+#: src/user_config.cpp:994
 #, c-format
 msgid "joy %d hat %d"
 msgstr "joystick %d hat %d"
 
-#: src/user_config.cpp:866
+#: src/user_config.cpp:1000
 #, c-format
 msgid "mouse axis %d %c"
 msgstr "muis as %d %c"
 
-#: src/user_config.cpp:863
+#: src/user_config.cpp:997
 #, c-format
 msgid "mouse btn %d"
 msgstr "muisknop %d"
 
-#: src/user_config.cpp:847
+#: src/user_config.cpp:980
-#: src/user_config.cpp:891
+#: src/user_config.cpp:1025
 #, c-format
 msgid "not set"
 msgstr "geen waarde"
 
+#~ msgid "Race Track"
+#~ msgstr "Racecircuit"
+

src/camera.cpp

@@ -124,13 +124,14 @@ void Camera::setMode(Mode mode)
     {
         m_distance = m_kart->getKartProperties()->getCameraDistance();
 
-        // In 2 and 3 player mode we have a different FOV and would not see our
+        // In splitscreen mode we have a different FOVs and rotations so we use
-        // kart at the default distance. We use 1.5 times the distance to fix that.
+        // 1.333 or 1.5 times the normal distance to compensate and make the 
+        // kart visible
         const int num_players = race_manager->getNumPlayers();
         if(num_players==2 || (num_players==3 && m_index==3) )
-            m_distance += m_distance*0.5f;
+            m_distance *= 1.5f;
         else if(num_players>=3)
-            m_distance += m_distance*0.3333333f;
+            m_distance *= 1.3333333f;
     }
 }   // setMode
 

src/gui/char_sel.cpp

@@ -79,6 +79,32 @@ CharSel::CharSel(int whichPlayer)
     if (m_player_index == 0)
         kart_properties_manager->clearAllSelectedKarts();
 
+    // Determine the list of all groups to display. A call to
+    // kart_properties_manager->getAllGroups() will return even groups without
+    // karts in it (e.g. because all karts are locked), so in this case we
+    // don't want to display this list.
+    m_all_groups = kart_properties_manager->getAllGroups();
+    std::vector<std::string>::iterator it = m_all_groups.begin();
+    while(it!=m_all_groups.end())
+    {
+        const std::vector<int> &kig=kart_properties_manager->getKartsInGroup(*it);
+        bool can_be_deleted=true;
+        for(unsigned int i=0; i<kig.size(); i++)
+        {
+            const KartProperties *k=kart_properties_manager->getKartById(kig[i]);
+            if(!unlock_manager->isLocked(k->getIdent()))
+            {
+                can_be_deleted=false;
+                break;
+            }   // if isLocked
+        }   // for i<kig.size
+        if(can_be_deleted)
+            it=m_all_groups.erase(it);
+        else
+            it++;
+    }
+
+
     if (m_player_index < (int)kart_properties_manager->getNumSelectedKarts())
         kart_properties_manager->removeLastSelectedKart();
 
@@ -210,8 +236,7 @@ void CharSel::updateScrollPosition()
         }
         else
         {
-            const std::vector<std::string> &groups=kart_properties_manager->getAllGroups();
+            widget_manager->setWgtText(WTOK_NAME0+i, m_all_groups[-indx-1]);
-            widget_manager->setWgtText(WTOK_NAME0+i, groups[-indx-1]);
             widget_manager->hideWgtTexture(WTOK_RACER0 + i);
             widget_manager->hideWgtRect(WTOK_RACER0 + i);
         }
@@ -239,11 +264,10 @@ void CharSel::switchGroup()
 
     // Now add the groups, indicated by a negative number as kart index
     // ----------------------------------------------------------------
-    const std::vector<std::string> groups=kart_properties_manager->getAllGroups();
+    for(int i =0; i<(int)m_all_groups.size(); i++)
-    for(int i =0; i<(int)groups.size(); i++)
     {
         // Only add groups other than the current one
-        if(groups[i]!=user_config->m_kart_group) m_index_avail_karts.push_back(-i-1);
+        if(m_all_groups[i]!=user_config->m_kart_group) m_index_avail_karts.push_back(-i-1);
     }
     if(m_index_avail_karts.size()>=m_max_entries) 
     {
@@ -290,7 +314,13 @@ void CharSel::switchCharacter(int n)
 {
     int indx=m_index_avail_karts[n];
         // if a group is hovered about, don't do anything
-    if(indx<0) return;
+    if(indx<0)
+    {
+        m_current_kart = -1;
+        ssgDeRefDelete(m_kart);
+        m_kart = NULL;
+        return;
+    }
     
     const KartProperties* kp= kart_properties_manager->getKartById(indx);
     if (m_current_kart != n && kp != NULL)
@@ -361,7 +391,7 @@ void CharSel::update(float dt)
         int token = widget_manager->getSelectedWgt() - WTOK_RACER0;
         if(token<0 || token>(int)m_index_avail_karts.size())
             token = widget_manager->getSelectedWgt() - WTOK_NAME0;
-                switchCharacter((token+m_offset)%m_index_avail_karts.size());
+        switchCharacter((token+m_offset)%m_index_avail_karts.size());
     }
 
     if (m_kart != NULL)
@@ -501,7 +531,7 @@ void CharSel::select()
     int kart_id = m_index_avail_karts[token];
     if(kart_id < 0) // group selected
     {
-        user_config->m_kart_group = kart_properties_manager->getAllGroups()[-kart_id-1];
+        user_config->m_kart_group = m_all_groups[-kart_id-1];
         switchGroup();
         // forces redraw of the model, otherwise (if m_current_kart=0) the new
         // model would not be displayed.

src/gui/char_sel.hpp

@@ -17,8 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_CHARSEL_H
+#ifndef HEADER_CHAR_SEL_HPP
-#define HEADER_CHARSEL_H
+#define HEADER_CHAR_SEL_HPP
 
 #include <vector>
 #include "base_gui.hpp"
@@ -29,17 +29,21 @@ class ssgContext;
 class CharSel: public BaseGUI
 {
 private:
-    ssgContext      *m_context;
+    ssgContext               *m_context;
-    ssgTransform    *m_kart;
+    ssgTransform             *m_kart;
-    int              m_current_kart;
+    int                       m_current_kart;
-    float            m_clock;
+    float                     m_clock;
-    int              m_player_index;
+    int                       m_player_index;
-    int              m_offset;        // index of first racer displayed
+    int                       m_offset;        // index of first racer displayed
-    unsigned int     m_num_entries;   // number of entries to display
+    unsigned int              m_num_entries;   // number of entries to display
     /** Helps to switch off the displayed text once only. */
-    bool             m_first_frame;
+    bool                      m_first_frame;
-    std::vector<int> m_index_avail_karts;
+    std::vector<int>          m_index_avail_karts;
+    /** List of all groups, but excluding empty groups (e.g. groups with all 
+     *  karts still locked. */
+    std::vector<std::string>  m_all_groups;
     static const unsigned int m_max_entries=7;
+
     void             updateScrollPosition();
     int              computeIndent(int n) {return 40+abs((int)(m_max_entries-1)/2 - n)*3;}
     void             switchGroup();

src/ide/vc9/supertuxkart.vcproj

@@ -517,7 +517,7 @@
 				Optimization="0"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)";../../../src/enet/include"
-				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"SVN\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
+				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.6\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -605,7 +605,7 @@
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)";../../../src/enet/include"
-				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"SVN\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
+				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.6\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

src/karts/kart.cpp

@@ -352,7 +352,7 @@ void Kart::reset()
     m_vehicle->applyEngineForce (0.0f, 3);
 
     Moveable::reset();
-    m_skidmarks->reset();
+    if(m_skidmarks) m_skidmarks->reset();
     for(int j=0; j<m_vehicle->getNumWheels(); j++)
     {
         m_vehicle->updateWheelTransform(j, true);
@@ -636,7 +636,8 @@ void Kart::update(float dt)
 
     // Check if any item was hit.
     item_manager->hitItem(this);
-    m_skidmarks->update(dt);
+    if(m_kart_properties->hasSkidmarks())
+        m_skidmarks->update(dt);
 
     // Remove the shadow if the kart is not on the ground (if a kart
     // is rescued isOnGround might still be true, since the kart rigid
@@ -862,7 +863,8 @@ void Kart::updatePhysics (float dt)
     }
     if(m_skidding>1.0f)
     {
-        if(m_skid_sound->getStatus() != SFXManager::SFX_PLAYING)
+        if(m_skid_sound->getStatus() != SFXManager::SFX_PLAYING && 
+            m_kart_properties->hasSkidmarks())
             m_skid_sound->play();
     }
     else if(m_skid_sound->getStatus() == SFXManager::SFX_PLAYING)
@@ -993,7 +995,8 @@ void Kart::loadData()
     m_nitro = new Nitro(this);
     m_nitro->ref();
 
-    m_skidmarks  = new SkidMarks(*this);
+    if(m_kart_properties->hasSkidmarks())
+        m_skidmarks = new SkidMarks(*this);
 
     m_shadow = createShadow(m_kart_properties->getShadowFile(), -1, 1, -1, 1);
     m_shadow->ref();

src/karts/kart_properties.cpp

@@ -72,8 +72,9 @@ KartProperties::KartProperties() : m_icon_material(0)
         m_rubber_band_duration = m_time_till_max_skid =
         m_skid_decrease = m_skid_increase = m_skid_visual = m_skid_max =
         m_camera_max_accel = m_camera_max_brake = 
-        m_camera_distance = UNDEFINED;
+        m_camera_distance    = UNDEFINED;
     m_gravity_center_shift   = Vec3(UNDEFINED);
+    m_has_skidmarks          = true;
     m_version                = 0;
     m_color.setValue(1.0f, 0.0f, 0.0f);
     m_engine_sfx_type = SFXManager::SOUND_ENGINE_SMALL;
@@ -261,6 +262,7 @@ void KartProperties::getAllData(const lisp::Lisp* lisp)
     lisp->get("skid-increase",             m_skid_increase            );
     lisp->get("skid-decrease",             m_skid_decrease            );
     lisp->get("time-till-max-skid",        m_time_till_max_skid       );
+    lisp->get("has-skidmarks",             m_has_skidmarks            );
     lisp->get("skid-max",                  m_skid_max                 );
     lisp->get("skid-visual",               m_skid_visual              );
 

src/karts/kart_properties.hpp

@@ -17,8 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_KARTPROPERTIES_H
+#ifndef HEADER_KART_PROPERTIES_HPP
-#define HEADER_KARTPROPERTIES_H
+#define HEADER_KART_PROPERTIES_HPP
 
 #include <string>
 #include <vector>
@@ -139,6 +139,8 @@ private:
                                        *   not skidding to decrease to 1.0. */
     float m_time_till_max_skid;       /**< Time till maximum skidding is 
                                        *   reached. */
+    bool  m_has_skidmarks;            /**< Kart leaves skid marks. */
+
     // Camera related setting
     // ----------------------
     float m_camera_max_accel;         // maximum acceleration of camera
@@ -226,6 +228,8 @@ public:
     /** Returns the time (in seconds) of drifting till the maximum skidding
      *  is reached. */
     float getTimeTillMaxSkid        () const {return m_time_till_max_skid;       }
+    /** Returns if the kart leaves skidmarks or not. */
+    bool hasSkidmarks               () const {return m_has_skidmarks;            }
     const std::vector<float>& 
           getGearSwitchRatio        () const {return m_gear_switch_ratio;        }
     const std::vector<float>& 

src/karts/kart_properties_manager.cpp

@@ -237,7 +237,7 @@ bool KartPropertiesManager::kartAvailable(int kartid)
     const KartProperties *kartprop=getKartById(kartid);
     if(unlock_manager->isLocked(kartprop->getIdent())) return false;
     return true;
-}   // testAndSetKart
+}   // kartAvailable
 
 //-----------------------------------------------------------------------------
 /** Sets a kart to be selected by specifying the identifier (name) of the kart.
@@ -285,7 +285,8 @@ std::vector<std::string> KartPropertiesManager::getRandomKartList(int count,
     // (i.e. locked or not available on all clients)
     for(unsigned int i=0; i<karts.size();)
     {
-        if(used[karts[i]] || !m_kart_available[karts[i]])
+        if(used[karts[i]] || !m_kart_available[karts[i]] || 
+            unlock_manager->isLocked(m_karts_properties[karts[i]]->getIdent()))
             karts.erase(karts.begin()+i);
         else
             i++;
@@ -310,7 +311,9 @@ std::vector<std::string> KartPropertiesManager::getRandomKartList(int count,
     karts.clear();
     for(unsigned int i=0; i<getNumberOfKarts(); i++)
     {
-        if(!used[i] && m_kart_available[i]) karts.push_back(i);
+        if(!used[i] && m_kart_available[i] &&
+            !unlock_manager->isLocked(m_karts_properties[i]->getIdent()) )
+            karts.push_back(i);
     }
     std::random_shuffle(karts.begin(), karts.end());
     // Then fill up the remaining empty spaces

src/user_config.cpp

@@ -221,15 +221,15 @@ void UserConfig::setDefaults()
     set(GA_P1_BRAKE,
                 Input(Input::IT_KEYBOARD, SDLK_DOWN));
     set(GA_P1_NITRO,
-                Input(Input::IT_KEYBOARD, SDLK_RSHIFT));
+                Input(Input::IT_KEYBOARD, SDLK_l));
     set(GA_P1_DRIFT,
-                Input(Input::IT_KEYBOARD, SDLK_MINUS));
+                Input(Input::IT_KEYBOARD, SDLK_k));
     set(GA_P1_RESCUE,
-                Input(Input::IT_KEYBOARD, SDLK_BACKSPACE));
+                Input(Input::IT_KEYBOARD, SDLK_h));
     set(GA_P1_FIRE,
-                Input(Input::IT_KEYBOARD, SDLK_RCTRL));
+                Input(Input::IT_KEYBOARD, SDLK_SPACE));
     set(GA_P1_LOOK_BACK,
-                Input(Input::IT_KEYBOARD, SDLK_RALT));
+                Input(Input::IT_KEYBOARD, SDLK_j));
 
     /* Player 2 default input settings */
     set(GA_P2_LEFT,
@@ -251,6 +251,13 @@ void UserConfig::setDefaults()
     set(GA_P2_LOOK_BACK,
                 Input(Input::IT_KEYBOARD, SDLK_LALT));
 
+    // If the same key is used for more than one player, the setting 
+    // is overwritten when reading back the file. To allow us to have 
+    // good settings for player 1 (and considering that 3 or 4 people 
+    // on a single keyboard is crazy anyway), we disable the defaults 
+    // for player 3 and 4.
+#undef DEFAULTS_FOR_PLAYER34
+#ifdef DEFAULTS_FOR_PLAYER34
     /* Player 3 default input settings */
     set(GA_P3_LEFT,
                 Input(Input::IT_KEYBOARD, SDLK_f));
@@ -290,6 +297,7 @@ void UserConfig::setDefaults()
                 Input(Input::IT_KEYBOARD, SDLK_PERIOD));
     set(GA_P4_LOOK_BACK,
                 Input(Input::IT_KEYBOARD, SDLK_SLASH));
+#endif
 
 }   // setDefaults