From: <cu...@us...> - 2013-05-30 11:55:05
|
Revision: 12808 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=12808&view=rev Author: curaga Date: 2013-05-30 11:54:58 +0000 (Thu, 30 May 2013) Log Message: ----------- Remove executable bit from some images Property Changed: ---------------- main/trunk/data/karts/puffy/fog.png main/trunk/data/karts/puffy/water-P.png main/trunk/data/karts/puffy/window.png main/trunk/data/tracks/lighthouse/crate1_diffuse.jpg main/trunk/data/tracks/lighthouse/dynamic_clouds.png main/trunk/data/tracks/lighthouse/earth.png main/trunk/data/tracks/lighthouse/light-1.png main/trunk/data/tracks/lighthouse/light.png main/trunk/data/tracks/lighthouse/lightHaloY.png main/trunk/data/tracks/lighthouse/plants.png main/trunk/data/tracks/lighthouse/roadRoundBrick.jpg main/trunk/data/tracks/lighthouse/rock_grey.png main/trunk/data/tracks/lighthouse/sea-bed.jpg main/trunk/data/tracks/lighthouse/tree_zen.jpg main/trunk/data/tracks/lighthouse/yellow_dirt.jpg main/trunk/data/tracks/mines/crate1_diffuse.jpg main/trunk/data/tracks/mines/crate1_diffuseBIS.jpg main/trunk/data/tracks/mines/crate2_diffuse.jpg main/trunk/data/tracks/mines/halo_lamp.png main/trunk/data/tracks/mines/lightHaloR.png main/trunk/data/tracks/mines/plants.png Property changes on: main/trunk/data/karts/puffy/fog.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/karts/puffy/water-P.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/karts/puffy/window.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/crate1_diffuse.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/dynamic_clouds.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/earth.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/light-1.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/light.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/lightHaloY.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/plants.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/roadRoundBrick.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/rock_grey.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/sea-bed.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/tree_zen.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/lighthouse/yellow_dirt.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/mines/crate1_diffuse.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/mines/crate1_diffuseBIS.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/mines/crate2_diffuse.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/mines/halo_lamp.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/mines/lightHaloR.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: main/trunk/data/tracks/mines/plants.png ___________________________________________________________________ Deleted: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-07-03 01:07:03
|
Revision: 13058 http://sourceforge.net/p/supertuxkart/code/13058 Author: auria Date: 2013-07-03 01:07:00 +0000 (Wed, 03 Jul 2013) Log Message: ----------- Strings update Modified Paths: -------------- main/trunk/data/gui/addons_screen.stkgui main/trunk/data/po/supertuxkart.pot Modified: main/trunk/data/gui/addons_screen.stkgui =================================================================== --- main/trunk/data/gui/addons_screen.stkgui 2013-07-03 00:12:00 UTC (rev 13057) +++ main/trunk/data/gui/addons_screen.stkgui 2013-07-03 01:07:00 UTC (rev 13058) @@ -12,9 +12,9 @@ <div x="0" y="0" width="98%" height="100%" layout="horizontal-row" align="center"> <textbox id="filter_name" proportion="9" align="center" /> <spacer width="10" /> - <label text="Updated" align="center" /> + <label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/> <spinner id="filter_date" proportion="5" align="center" min_value="0" wrap_around="true"/> - <label text="Rating >=" align="center"/> + <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating"/> <spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/> <icon-button id="filter_search" height="100%" icon="gui/search.png"/> </div> Modified: main/trunk/data/po/supertuxkart.pot =================================================================== --- main/trunk/data/po/supertuxkart.pot 2013-07-03 00:12:00 UTC (rev 13057) +++ main/trunk/data/po/supertuxkart.pot 2013-07-03 01:07:00 UTC (rev 13058) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: supertuxkart\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-27 17:38-0400\n" +"POT-Creation-Date: 2013-07-01 19:11-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -43,7 +43,7 @@ msgstr "" #. I18N: shown when a player receives a plunger in his face -#: src/items/plunger.cpp:134 +#: src/items/plunger.cpp:133 msgid "%0 gets a fancy mask from %1" msgstr "" @@ -80,7 +80,7 @@ msgstr "" #. I18N: shown when a player receives a plunger in his face -#: src/items/plunger.cpp:136 +#: src/items/plunger.cpp:135 msgid "%1 merges %0's face with a plunger" msgstr "" @@ -113,26 +113,26 @@ msgstr "" #. I18N: as in: The Old Island by Johannes Sjolund -#: src/states_screens/addons_screen.cpp:226 +#: src/states_screens/addons_screen.cpp:312 #, c-format msgid "" "%s\n" "by %s" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:172 -#: src/states_screens/dialogs/addons_loading.cpp:176 +#: src/states_screens/dialogs/addons_loading.cpp:171 +#: src/states_screens/dialogs/addons_loading.cpp:175 #, c-format msgid "%s KB" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:165 +#: src/states_screens/dialogs/addons_loading.cpp:164 #, c-format msgid "%s MB" msgstr "" #. I18N: as in: The Old Island by Johannes Sjolund -#: src/states_screens/addons_screen.cpp:216 +#: src/states_screens/addons_screen.cpp:302 #, c-format msgctxt "addons" msgid "%s by %s" @@ -158,7 +158,7 @@ #. I18N: shown when a player is hit by a rubber ball. %1 is the #. attacker, %0 is the victim. -#: src/items/rubber_ball.cpp:305 +#: src/items/rubber_ball.cpp:307 #, c-format msgid "%s is being bounced around." msgstr "" @@ -169,7 +169,7 @@ msgid "%s is practicing with a blue, big, spheric yo-yo" msgstr "" -#: src/states_screens/kart_selection.cpp:594 +#: src/states_screens/kart_selection.cpp:592 #, c-format msgid "%s is ready" msgstr "" @@ -191,7 +191,7 @@ msgid "%s should play (rubber) darts instead of bowling" msgstr "" -#: src/modes/world.cpp:1004 +#: src/modes/world.cpp:1008 #, c-format msgid "'%s' has been eliminated." msgstr "" @@ -209,13 +209,13 @@ msgid "(network play is not yet available)" msgstr "" -#: src/states_screens/options_screen_input2.cpp:323 +#: src/states_screens/options_screen_input2.cpp:322 msgid "* A blue item means a conflict with another configuration" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: in the help screen -#: data/po/gui_strings.h:770 +#: data/po/gui_strings.h:778 msgid "* Current key bindings can be seen/changed in menu Options" msgstr "" @@ -236,6 +236,26 @@ "join the game." msgstr "" +#: src/states_screens/addons_screen.cpp:49 +msgid "1 month" +msgstr "" + +#: src/states_screens/addons_screen.cpp:47 +msgid "1 week" +msgstr "" + +#: src/states_screens/addons_screen.cpp:53 +msgid "1 year" +msgstr "" + +#: src/states_screens/addons_screen.cpp:48 +msgid "2 weeks" +msgstr "" + +#: src/states_screens/addons_screen.cpp:54 +msgid "2 years" +msgstr "" + #. I18N: Game mode #: src/race/race_manager.hpp:181 msgid "3 Strikes Battle" @@ -249,6 +269,18 @@ "they lose all their lives." msgstr "" +#: src/states_screens/addons_screen.cpp:50 +msgid "3 months" +msgstr "" + +#: src/states_screens/addons_screen.cpp:51 +msgid "6 months" +msgstr "" + +#: src/states_screens/addons_screen.cpp:52 +msgid "9 months" +msgstr "" + #. I18N: ./data/gui/track_info_dialog.stkgui #: data/po/gui_strings.h:119 msgid "= Highscores =" @@ -264,12 +296,12 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:701 +#: data/po/gui_strings.h:709 msgid "About" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:191 +#: src/states_screens/options_screen_input2.cpp:190 msgid "Accelerate" msgstr "" @@ -313,52 +345,54 @@ #. I18N: ./data/gui/arenas.stkgui #. I18N: track group #: src/states_screens/tracks_screen.cpp:176 -#: src/states_screens/kart_selection.cpp:1034 -#: src/states_screens/arenas_screen.cpp:81 data/po/gui_strings.h:794 +#: src/states_screens/kart_selection.cpp:1032 +#: src/states_screens/arenas_screen.cpp:81 data/po/gui_strings.h:802 msgid "Add-Ons" msgstr "" -#: src/states_screens/addons_screen.cpp:84 +#: src/states_screens/addons_screen.cpp:107 msgid "Add-on name" msgstr "" #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:685 +#: data/po/gui_strings.h:693 msgid "Addons" msgstr "" #. I18N: ./data/karts/adiumy/kart.xml -#: data/po/gui_strings.h:837 +#: data/po/gui_strings.h:845 msgid "Adiumy" msgstr "" #. I18N: name of the tab that will show tracks from all groups #. I18N: if all kart animations are enabled #. I18N: name of the tab that will show tracks from all groups +#. I18N: Time filters for add-ons #. I18N: name of the tab that will show arenas from all groups #. I18N: ./data/gui/arenas.stkgui #. I18N: track group #: src/states_screens/tracks_screen.cpp:168 #: src/states_screens/options_screen_video.cpp:354 -#: src/states_screens/kart_selection.cpp:1026 -#: src/states_screens/arenas_screen.cpp:73 data/po/gui_strings.h:798 +#: src/states_screens/kart_selection.cpp:1024 +#: src/states_screens/addons_screen.cpp:46 +#: src/states_screens/arenas_screen.cpp:73 data/po/gui_strings.h:806 msgid "All" msgstr "" #. I18N: ./data/gui/tracks.stkgui #. I18N: Section in track selection screen -#: data/po/gui_strings.h:724 +#: data/po/gui_strings.h:732 msgid "All Tracks" msgstr "" -#: src/states_screens/race_setup_screen.cpp:227 +#: src/states_screens/race_setup_screen.cpp:248 msgid "All blows allowed, so catch weapons and make clever use of them!" msgstr "" #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:665 +#: data/po/gui_strings.h:673 msgid "Allow STK to connect to the Internet" msgstr "" @@ -415,7 +449,7 @@ msgstr "" #. I18N: shown before deleting an input configuration -#: src/states_screens/options_screen_input2.cpp:503 +#: src/states_screens/options_screen_input2.cpp:504 msgid "Are you sure you want to permanently delete this configuration?" msgstr "" @@ -423,13 +457,13 @@ #. I18N: Section in the addons menu #. I18N: ./data/gui/arenas.stkgui #. I18N: Section in arena tracks selection screen -#: data/po/gui_strings.h:609 data/po/gui_strings.h:786 +#: data/po/gui_strings.h:617 data/po/gui_strings.h:794 msgid "Arenas" msgstr "" #. I18N: ./data/tracks/lighthouse/track.xml #: data/po/gui_strings.h:8 -msgid "Around the Lighthouse" +msgid "Around the lighthouse" msgstr "" #. I18N: shown when anchor applied. %s is the victim. @@ -440,40 +474,39 @@ #. I18N: ./data/gui/press_a_key_dialog.stkgui #. I18N: When configuring input -#: data/po/gui_strings.h:712 +#: data/po/gui_strings.h:720 msgid "Assign to ESC key" msgstr "" #. I18N: ./data/grandprix/4_atworldsend.grandprix -#: data/po/gui_strings.h:107 data/po/gui_strings.h:801 +#: data/po/gui_strings.h:107 data/po/gui_strings.h:809 msgid "At World's End" msgstr "" #. I18N: ./data/gui/options_audio.stkgui #. I18N: Section in the settings menu #: src/states_screens/options_screen_input.cpp:137 -#: src/states_screens/options_screen_input2.cpp:72 +#: src/states_screens/options_screen_input2.cpp:71 #: src/states_screens/options_screen_video.cpp:87 -#: src/states_screens/options_screen_ui.cpp:113 -#: src/states_screens/options_screen_players.cpp:72 data/po/gui_strings.h:341 +#: src/states_screens/options_screen_ui.cpp:112 +#: src/states_screens/options_screen_players.cpp:71 data/po/gui_strings.h:341 msgid "Audio" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: src/tracks/track_object_presentation.cpp:613 data/po/gui_strings.h:754 +#: src/tracks/track_object_presentation.cpp:613 data/po/gui_strings.h:762 msgid "Avoid bananas!" msgstr "" -#. I18N: to appear in input configuration screen, for gamepad axes -#: src/input/binding.cpp:266 +#: src/input/binding.cpp:280 src/input/binding.cpp:284 #, c-format msgid "Axis %d %s" msgstr "" #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-ons screen action -#: src/states_screens/dialogs/addons_loading.cpp:264 data/po/gui_strings.h:782 +#: src/states_screens/dialogs/addons_loading.cpp:260 data/po/gui_strings.h:790 msgid "Back" msgstr "" @@ -485,10 +518,14 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:619 +#: data/po/gui_strings.h:627 msgid "Back to Race" msgstr "" +#: src/states_screens/race_result_gui.cpp:134 +msgid "Back to challenge selection" +msgstr "" + #. I18N: ./data/gui/options_device.stkgui #. I18N: In the input configuration screen #: data/po/gui_strings.h:441 @@ -501,14 +538,10 @@ msgid "Back to menu" msgstr "" -#: src/states_screens/race_result_gui.cpp:139 +#: src/states_screens/race_result_gui.cpp:140 msgid "Back to the menu" msgstr "" -#: src/states_screens/race_result_gui.cpp:135 -msgid "Back to track selection" -msgstr "" - #: src/items/powerup.cpp:85 msgid "Banana? Box? Banana? Box? Banana? Box?" msgstr "" @@ -526,12 +559,12 @@ msgstr "" #. I18N: ./data/karts/beagle/kart.xml -#: data/po/gui_strings.h:813 +#: data/po/gui_strings.h:821 msgid "Beagle" msgstr "" #. I18N: ./data/karts/beastie/kart.xml -#: data/po/gui_strings.h:822 +#: data/po/gui_strings.h:833 msgid "Beastie" msgstr "" @@ -558,7 +591,7 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:194 +#: src/states_screens/options_screen_input2.cpp:193 msgid "Brake" msgstr "" @@ -579,7 +612,7 @@ "Cake - thrown at the closest rival, best on short ranges and long straights." msgstr "" -#: src/addons/news_manager.cpp:149 src/addons/network_http.cpp:443 +#: src/addons/news_manager.cpp:149 src/addons/network_http.cpp:440 msgid "Can't access stkaddons server..." msgstr "" @@ -598,7 +631,7 @@ #. I18N: ./data/gui/story_mode_new.stkgui #: src/states_screens/dialogs/add_device_dialog.cpp:128 #: src/states_screens/dialogs/player_info_dialog.cpp:106 -#: src/states_screens/dialogs/addons_loading.cpp:230 data/po/gui_strings.h:216 +#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:216 #: data/po/gui_strings.h:491 data/po/gui_strings.h:561 msgid "Cancel" msgstr "" @@ -609,7 +642,7 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:232 +#: src/states_screens/options_screen_input2.cpp:231 msgid "Cancel/Back" msgstr "" @@ -644,7 +677,7 @@ msgstr "" #. I18N: ./data/gui/help1.stkgui -#: data/po/gui_strings.h:746 +#: data/po/gui_strings.h:754 msgid "Click here to play the tutorial" msgstr "" @@ -655,7 +688,7 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:750 +#: data/po/gui_strings.h:758 msgid "Collect blue boxes : they will give you weapons or other powerups" msgstr "" @@ -669,9 +702,13 @@ msgid "Collect nitro bottles (we will use them after the curve)" msgstr "" +#: src/states_screens/race_gui_base.cpp:717 +msgid "Collect nitro!" +msgstr "" + #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:758 +#: data/po/gui_strings.h:766 msgid "" "Collecting nitro allows you to get speed boosts whenever you wish by " "pressing the appropriate key. You can see your current level of nitro in the " @@ -689,7 +726,7 @@ msgid "Confirm resolution within %i seconds" msgstr "" -#: src/states_screens/race_setup_screen.cpp:234 +#: src/states_screens/race_setup_screen.cpp:255 msgid "Contains no powerups, so only your driving skills matter!" msgstr "" @@ -702,7 +739,7 @@ #. I18N: ./data/gui/grand_prix_lose.stkgui #: src/states_screens/race_result_gui.cpp:115 data/po/gui_strings.h:220 #: data/po/gui_strings.h:422 data/po/gui_strings.h:590 -#: data/po/gui_strings.h:612 data/po/gui_strings.h:646 +#: data/po/gui_strings.h:620 data/po/gui_strings.h:654 msgid "Continue" msgstr "" @@ -710,15 +747,15 @@ #. I18N: Section in the settings menu #. I18N: ./data/gui/options_input.stkgui #. I18N: Section in the settings menu -#: src/states_screens/options_screen_audio.cpp:67 +#: src/states_screens/options_screen_audio.cpp:66 #: src/states_screens/options_screen_video.cpp:90 -#: src/states_screens/options_screen_ui.cpp:115 -#: src/states_screens/options_screen_players.cpp:74 data/po/gui_strings.h:433 +#: src/states_screens/options_screen_ui.cpp:114 +#: src/states_screens/options_screen_players.cpp:73 data/po/gui_strings.h:433 #: data/po/gui_strings.h:576 msgid "Controls" msgstr "" -#: src/input/wiimote_manager.cpp:498 +#: src/input/wiimote_manager.cpp:338 msgid "Could not detect any wiimote :/" msgstr "" @@ -747,13 +784,13 @@ #. I18N: ./data/gui/options_device.stkgui #. I18N: To delete a keyboard configuration -#: src/states_screens/options_screen_input2.cpp:97 data/po/gui_strings.h:437 +#: src/states_screens/options_screen_input2.cpp:96 data/po/gui_strings.h:437 msgid "Delete Configuration" msgstr "" #. I18N: button to disable a gamepad configuration -#: src/states_screens/options_screen_input2.cpp:82 -#: src/states_screens/options_screen_input2.cpp:515 +#: src/states_screens/options_screen_input2.cpp:81 +#: src/states_screens/options_screen_input2.cpp:516 msgid "Disable Device" msgstr "" @@ -767,11 +804,11 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:661 +#: data/po/gui_strings.h:669 msgid "Display FPS" msgstr "" -#: src/states_screens/race_result_gui.cpp:229 +#: src/states_screens/race_result_gui.cpp:230 msgid "Do you really want to abort the Grand Prix?" msgstr "" @@ -785,12 +822,12 @@ msgid "Do you want to fly kites?" msgstr "" -#: src/karts/controller/player_controller.cpp:340 +#: src/karts/controller/player_controller.cpp:334 msgid "Don't accelerate before go" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:220 +#: src/states_screens/options_screen_input2.cpp:219 msgid "Down" msgstr "" @@ -799,29 +836,29 @@ msgid "Easter Egg Hunt" msgstr "" -#: src/modes/easter_egg_hunt.cpp:203 +#: src/modes/easter_egg_hunt.cpp:202 #, c-format msgid "Eggs: %d / %d" msgstr "" #. I18N: ./data/karts/elephpant/kart.xml -#: data/po/gui_strings.h:852 +#: data/po/gui_strings.h:860 msgid "Elephpant" msgstr "" -#: src/states_screens/race_result_gui.cpp:344 -#: src/states_screens/race_result_gui.cpp:701 +#: src/states_screens/race_result_gui.cpp:345 +#: src/states_screens/race_result_gui.cpp:702 msgid "Eliminated" msgstr "" #. I18N: ./data/karts/emule/kart.xml -#: data/po/gui_strings.h:843 +#: data/po/gui_strings.h:851 msgid "Emule" msgstr "" #. I18N: button to enable a gamepad configuration -#: src/states_screens/options_screen_input2.cpp:84 -#: src/states_screens/options_screen_input2.cpp:516 +#: src/states_screens/options_screen_input2.cpp:83 +#: src/states_screens/options_screen_input2.cpp:517 msgid "Enable Device" msgstr "" @@ -845,7 +882,7 @@ msgid "Enter the new player's name" msgstr "" -#: src/states_screens/kart_selection.cpp:1279 +#: src/states_screens/kart_selection.cpp:1277 msgid "" "Everyone:\n" "Press 'Select' now to join the game!" @@ -853,7 +890,7 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:643 +#: data/po/gui_strings.h:651 msgid "Exit Race" msgstr "" @@ -870,7 +907,7 @@ #. I18N: shown when a player is hit by a rubber ball. %1 is the #. attacker, %0 is the victim. -#: src/items/rubber_ball.cpp:308 +#: src/items/rubber_ball.cpp:310 msgid "Fetch the ball, %0!" msgstr "" @@ -878,12 +915,12 @@ msgid "Final lap!" msgstr "" -#: src/states_screens/race_setup_screen.cpp:275 +#: src/states_screens/race_setup_screen.cpp:296 msgid "Find all Easter Eggs" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:197 +#: src/states_screens/options_screen_input2.cpp:196 msgid "Fire" msgstr "" @@ -918,7 +955,7 @@ msgid "Fort Magma" msgstr "" -#: src/input/wiimote_manager.cpp:490 +#: src/input/wiimote_manager.cpp:330 #, c-format msgid "Found %d wiimote(s)" msgstr "" @@ -930,7 +967,7 @@ msgstr "" #. I18N: Key binding section -#: src/states_screens/options_screen_input2.cpp:130 +#: src/states_screens/options_screen_input2.cpp:129 msgid "Game Keys" msgstr "" @@ -943,18 +980,18 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: Tab in help menu #: data/po/gui_strings.h:154 data/po/gui_strings.h:305 -#: data/po/gui_strings.h:456 data/po/gui_strings.h:739 +#: data/po/gui_strings.h:456 data/po/gui_strings.h:747 msgid "Game Modes" msgstr "" #. I18N: to appear in input configuration screen, for gamepad buttons -#: src/input/binding.cpp:271 +#: src/input/binding.cpp:291 #, c-format msgid "Gamepad button %d" msgstr "" #. I18N: to appear in input configuration screen, for gamepad hats -#: src/input/binding.cpp:256 src/input/binding.cpp:261 +#: src/input/binding.cpp:269 src/input/binding.cpp:274 #, c-format msgid "Gamepad hat %d" msgstr "" @@ -968,7 +1005,7 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: Tab in help menu #: data/po/gui_strings.h:146 data/po/gui_strings.h:297 -#: data/po/gui_strings.h:448 data/po/gui_strings.h:731 +#: data/po/gui_strings.h:448 data/po/gui_strings.h:739 msgid "General" msgstr "" @@ -978,12 +1015,12 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:631 +#: data/po/gui_strings.h:639 msgid "Give Up Race" msgstr "" #. I18N: ./data/karts/gnu/kart.xml -#: data/po/gui_strings.h:831 +#: data/po/gui_strings.h:839 msgid "Gnu" msgstr "" @@ -995,11 +1032,11 @@ #. I18N: ./data/gui/tracks.stkgui #. I18N: Section in track selection screen #: src/states_screens/dialogs/select_challenge.cpp:139 -#: data/po/gui_strings.h:720 +#: data/po/gui_strings.h:728 msgid "Grand Prix" msgstr "" -#: src/states_screens/race_result_gui.cpp:914 +#: src/states_screens/race_result_gui.cpp:915 msgid "Grand Prix progress:" msgstr "" @@ -1012,10 +1049,10 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: Section in the settings menu #: src/states_screens/options_screen_input.cpp:136 -#: src/states_screens/options_screen_audio.cpp:64 -#: src/states_screens/options_screen_input2.cpp:71 -#: src/states_screens/options_screen_ui.cpp:112 -#: src/states_screens/options_screen_players.cpp:71 data/po/gui_strings.h:372 +#: src/states_screens/options_screen_audio.cpp:63 +#: src/states_screens/options_screen_input2.cpp:70 +#: src/states_screens/options_screen_ui.cpp:111 +#: src/states_screens/options_screen_players.cpp:70 data/po/gui_strings.h:372 msgid "Graphics" msgstr "" @@ -1029,7 +1066,7 @@ msgid "Green Valley" msgstr "" -#: src/config/user_config.cpp:546 +#: src/config/user_config.cpp:604 msgid "Guest" msgstr "" @@ -1044,21 +1081,21 @@ #. I18N: Race paused button #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:532 data/po/gui_strings.h:639 -#: data/po/gui_strings.h:693 +#: data/po/gui_strings.h:532 data/po/gui_strings.h:647 +#: data/po/gui_strings.h:701 msgid "Help" msgstr "" #. I18N: ./data/karts/hexley/kart.xml -#: data/po/gui_strings.h:816 +#: data/po/gui_strings.h:824 msgid "Hexley" msgstr "" -#: src/states_screens/race_result_gui.cpp:947 +#: src/states_screens/race_result_gui.cpp:948 msgid "Highscores" msgstr "" -#: src/states_screens/race_setup_screen.cpp:256 +#: src/states_screens/race_setup_screen.cpp:277 msgid "" "Hit others with weapons until they lose all their lives. (Only in " "multiplayer games)" @@ -1077,20 +1114,20 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:762 +#: data/po/gui_strings.h:770 msgid "" "If you see a button with a lock like this one, you need to complete a " "challenge to unlock it." msgstr "" -#: src/input/input_manager.cpp:609 +#: src/input/input_manager.cpp:654 #, c-format msgid "Ignoring '%s', you needed to join earlier to play!" msgstr "" #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-on screen action -#: data/po/gui_strings.h:774 +#: data/po/gui_strings.h:782 msgid "Install" msgstr "" @@ -1113,7 +1150,7 @@ #. I18N: ./data/gui/addons_screen.stkgui #. I18N: Section in the addons menu -#: data/po/gui_strings.h:601 +#: data/po/gui_strings.h:609 msgid "Karts" msgstr "" @@ -1124,7 +1161,7 @@ msgstr "" #. I18N: short definition for follow-the-leader game mode -#: src/states_screens/race_setup_screen.cpp:247 +#: src/states_screens/race_setup_screen.cpp:268 msgid "Keep up with the leader kart but don't overtake it!" msgstr "" @@ -1134,7 +1171,7 @@ msgstr "" #. I18N: ./data/karts/konqi/kart.xml -#: data/po/gui_strings.h:834 +#: data/po/gui_strings.h:842 msgid "Konqi" msgstr "" @@ -1156,12 +1193,12 @@ msgid "Laps : %i" msgstr "" -#: src/modes/follow_the_leader.cpp:56 src/modes/follow_the_leader.cpp:230 +#: src/modes/follow_the_leader.cpp:55 src/modes/follow_the_leader.cpp:229 msgid "Leader" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:223 +#: src/states_screens/options_screen_input2.cpp:222 msgid "Left" msgstr "" @@ -1169,18 +1206,18 @@ msgid "Loading" msgstr "" -#: src/states_screens/kart_selection.cpp:930 +#: src/states_screens/kart_selection.cpp:928 msgid "Locked" msgstr "" #: src/states_screens/tracks_screen.cpp:297 #: src/states_screens/tracks_screen.cpp:328 -#: src/states_screens/kart_selection.cpp:935 -#: src/states_screens/kart_selection.cpp:2056 -#: src/states_screens/kart_selection.cpp:2088 +#: src/states_screens/kart_selection.cpp:933 +#: src/states_screens/kart_selection.cpp:2054 +#: src/states_screens/kart_selection.cpp:2086 #: src/states_screens/arenas_screen.cpp:239 #: src/states_screens/arenas_screen.cpp:269 -#: src/states_screens/race_setup_screen.cpp:239 +#: src/states_screens/race_setup_screen.cpp:260 msgid "Locked : solve active challenges to gain access to more!" msgstr "" @@ -1189,7 +1226,7 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:206 +#: src/states_screens/options_screen_input2.cpp:205 msgid "Look Back" msgstr "" @@ -1203,7 +1240,7 @@ msgstr "" #. I18N: Key binding section -#: src/states_screens/options_screen_input2.cpp:144 +#: src/states_screens/options_screen_input2.cpp:143 msgid "Menu Keys" msgstr "" @@ -1214,30 +1251,25 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:669 +#: data/po/gui_strings.h:677 msgid "Minimal Race GUI" msgstr "" #. I18N: to appear in input configuration screen, for mouse (might not be used at all) -#: src/input/binding.cpp:278 +#: src/input/binding.cpp:298 #, c-format msgid "Mouse axis %d %s" msgstr "" #. I18N: to appear in input configuration screen, for mouse (might not be used at all) -#: src/input/binding.cpp:274 +#: src/input/binding.cpp:294 #, c-format msgid "Mouse button %d" msgstr "" -#. I18N: ./data/karts/mozilla/kart.xml -#: data/po/gui_strings.h:828 -msgid "Mozilla" -msgstr "" - #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:681 +#: data/po/gui_strings.h:689 msgid "Multiplayer" msgstr "" @@ -1250,7 +1282,7 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: Tab in help menu #: data/po/gui_strings.h:158 data/po/gui_strings.h:309 -#: data/po/gui_strings.h:460 data/po/gui_strings.h:743 +#: data/po/gui_strings.h:460 data/po/gui_strings.h:751 msgid "Multiplayer" msgstr "" @@ -1265,12 +1297,12 @@ msgid "New Game" msgstr "" -#: src/challenges/challenge_data.cpp:511 +#: src/challenges/challenge_data.cpp:509 #, c-format msgid "New Grand Prix '%s' now available" msgstr "" -#: src/challenges/challenge_data.cpp:515 +#: src/challenges/challenge_data.cpp:513 #, c-format msgid "New difficulty '%s' now available" msgstr "" @@ -1279,28 +1311,32 @@ msgid "New fastest lap" msgstr "" -#: src/challenges/challenge_data.cpp:501 +#: src/challenges/challenge_data.cpp:499 #, c-format msgid "New game mode '%s' now available" msgstr "" -#: src/challenges/challenge_data.cpp:525 +#: src/challenges/challenge_data.cpp:523 #, c-format msgid "New kart '%s' now available" msgstr "" -#: src/challenges/challenge_data.cpp:495 +#: src/challenges/challenge_data.cpp:493 #, c-format msgid "New track '%s' now available" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:200 +#: src/states_screens/options_screen_input2.cpp:199 msgid "Nitro" msgstr "" +#: src/states_screens/dialogs/select_challenge.cpp:141 +msgid "Nitro challenge" +msgstr "" + #. I18N: ./data/karts/nolok/kart.xml -#: data/po/gui_strings.h:819 +#: data/po/gui_strings.h:830 msgid "Nolok" msgstr "" @@ -1358,7 +1394,7 @@ msgstr "" #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix -#: data/po/gui_strings.h:110 data/po/gui_strings.h:804 +#: data/po/gui_strings.h:110 data/po/gui_strings.h:812 msgid "Off the beaten track" msgstr "" @@ -1378,7 +1414,7 @@ msgid "Oliver's Math Class" msgstr "" -#: src/input/input_manager.cpp:639 +#: src/input/input_manager.cpp:684 msgid "Only the Game Master may act at this point!" msgstr "" @@ -1393,8 +1429,8 @@ #. I18N: Race paused button #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:528 data/po/gui_strings.h:635 -#: data/po/gui_strings.h:689 +#: data/po/gui_strings.h:528 data/po/gui_strings.h:643 +#: data/po/gui_strings.h:697 msgid "Options" msgstr "" @@ -1404,27 +1440,27 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:212 +#: src/states_screens/options_screen_input2.cpp:211 msgid "Pause Game" msgstr "" #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: ./data/gui/race_paused_dialog.stkgui -#: data/po/gui_strings.h:516 data/po/gui_strings.h:615 +#: data/po/gui_strings.h:516 data/po/gui_strings.h:623 msgid "Paused" msgstr "" -#: src/karts/controller/player_controller.cpp:338 +#: src/karts/controller/player_controller.cpp:332 msgid "Penalty time!!" msgstr "" #. I18N: ./data/grandprix/1_penguinplayground.grandprix -#: data/po/gui_strings.h:113 data/po/gui_strings.h:807 +#: data/po/gui_strings.h:113 data/po/gui_strings.h:815 msgid "Penguin Playground" msgstr "" #. I18N: ./data/karts/pidgin/kart.xml -#: data/po/gui_strings.h:840 +#: data/po/gui_strings.h:848 msgid "Pidgin" msgstr "" @@ -1448,23 +1484,23 @@ #. I18N: ./data/gui/options_players.stkgui #. I18N: Section in the settings menu #: src/states_screens/options_screen_input.cpp:139 -#: src/states_screens/options_screen_audio.cpp:66 -#: src/states_screens/options_screen_input2.cpp:74 +#: src/states_screens/options_screen_audio.cpp:65 +#: src/states_screens/options_screen_input2.cpp:73 #: src/states_screens/options_screen_video.cpp:89 -#: src/states_screens/options_screen_ui.cpp:114 data/po/gui_strings.h:502 +#: src/states_screens/options_screen_ui.cpp:113 data/po/gui_strings.h:502 msgid "Players" msgstr "" #. I18N: shown when config file is too old -#: src/input/device_manager.cpp:479 +#: src/input/device_manager.cpp:480 msgid "Please re-configure your key bindings." msgstr "" -#: src/states_screens/addons_screen.cpp:330 +#: src/states_screens/addons_screen.cpp:416 msgid "Please wait while addons are updated" msgstr "" -#: src/states_screens/main_menu_screen.cpp:393 +#: src/states_screens/main_menu_screen.cpp:402 msgid "Please wait while the add-ons are loading" msgstr "" @@ -1491,12 +1527,12 @@ #. I18N: When configuring input #. I18N: ./data/gui/press_a_key_dialog.stkgui #. I18N: When configuring input -#: data/po/gui_strings.h:569 data/po/gui_strings.h:716 +#: data/po/gui_strings.h:569 data/po/gui_strings.h:724 msgid "Press ESC to cancel" msgstr "" #. I18N: ./data/gui/press_a_key_dialog.stkgui -#: data/po/gui_strings.h:708 +#: data/po/gui_strings.h:716 msgid "Press a key" msgstr "" @@ -1512,36 +1548,41 @@ msgid "Press enter or double-click on a player to edit him/her" msgstr "" -#: src/states_screens/race_gui_overworld.cpp:454 +#: src/states_screens/race_gui_overworld.cpp:455 msgid "Press fire to play the tutorial" msgstr "" -#: src/states_screens/race_gui_overworld.cpp:514 +#: src/states_screens/race_gui_overworld.cpp:515 msgid "Press fire to start the challenge" msgstr "" -#: src/input/wiimote_manager.cpp:468 +#: src/input/wiimote_manager.cpp:308 msgid "" "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery " "mode, then click on OK." msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:310 +#. I18N: ./data/karts/sara/kart.xml +#: data/po/gui_strings.h:827 +msgid "Princess Sara" +msgstr "" + +#: src/states_screens/dialogs/addons_loading.cpp:326 #, c-format msgid "Problems installing the addon '%s'." msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:350 +#: src/states_screens/dialogs/addons_loading.cpp:366 #, c-format msgid "Problems removing the addon '%s'." msgstr "" #. I18N: ./data/karts/puffy/kart.xml -#: data/po/gui_strings.h:825 +#: data/po/gui_strings.h:836 msgid "Puffy" msgstr "" -#: src/states_screens/race_setup_screen.cpp:264 +#: src/states_screens/race_setup_screen.cpp:285 msgid "" "Push the ball to the opposite cage to score goals. (Only in multiplayer " "games)" @@ -1549,7 +1590,7 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:705 +#: data/po/gui_strings.h:713 msgid "Quit" msgstr "" @@ -1565,8 +1606,8 @@ msgid "Random Arena" msgstr "" -#: src/states_screens/kart_selection.cpp:916 -#: src/states_screens/kart_selection.cpp:2107 +#: src/states_screens/kart_selection.cpp:914 +#: src/states_screens/kart_selection.cpp:2105 msgid "Random Kart" msgstr "" @@ -1580,10 +1621,10 @@ msgid "Rank" msgstr "" -#. I18N: for add-on rating, "Rating: 1.5/3.0" -#: src/states_screens/dialogs/addons_loading.cpp:111 -#, c-format -msgid "Rating: %s/%s" +#. I18N: ./data/gui/addons_screen.stkgui +#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating +#: data/po/gui_strings.h:605 +msgid "Rating >=" msgstr "" #. I18N: as in "ready, set, go", shown at the beginning of the race @@ -1642,7 +1683,7 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:209 +#: src/states_screens/options_screen_input2.cpp:208 msgid "Rescue" msgstr "" @@ -1652,13 +1693,13 @@ msgid "Resolution" msgstr "" -#: src/states_screens/race_result_gui.cpp:130 +#: src/states_screens/race_result_gui.cpp:128 msgid "Restart" msgstr "" #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:627 +#: data/po/gui_strings.h:635 msgid "Restart Race" msgstr "" @@ -1669,7 +1710,7 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:226 +#: src/states_screens/options_screen_input2.cpp:225 msgid "Right" msgstr "" @@ -1679,7 +1720,7 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:229 +#: src/states_screens/options_screen_input2.cpp:228 msgid "Select" msgstr "" @@ -1712,7 +1753,7 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: src/states_screens/race_result_gui.cpp:127 data/po/gui_strings.h:623 +#: src/states_screens/race_result_gui.cpp:138 data/po/gui_strings.h:631 msgid "Setup New Race" msgstr "" @@ -1728,23 +1769,23 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:677 +#: data/po/gui_strings.h:685 msgid "Single-player" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:177 +#: src/states_screens/dialogs/addons_loading.cpp:176 #, c-format msgid "Size: %s" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:203 +#: src/states_screens/options_screen_input2.cpp:202 msgid "Skidding" msgstr "" #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the graphics settings -#: data/po/gui_strings.h:657 +#: data/po/gui_strings.h:665 msgid "Skin" msgstr "" @@ -1763,15 +1804,15 @@ msgid "Soccer field" msgstr "" -#: src/states_screens/addons_screen.cpp:402 -#: src/states_screens/main_menu_screen.cpp:386 +#: src/states_screens/addons_screen.cpp:494 +#: src/states_screens/main_menu_screen.cpp:395 msgid "" "Sorry, an error occurred while contacting the add-ons website. Make sure you " "are connected to the Internet and that SuperTuxKart is not blocked by a " "firewall" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:259 +#: src/states_screens/dialogs/addons_loading.cpp:255 msgid "Sorry, downloading the add-on failed" msgstr "" @@ -1783,7 +1824,7 @@ #. I18N: ./data/gui/arenas.stkgui #. I18N: track group -#: data/po/gui_strings.h:790 +#: data/po/gui_strings.h:798 msgid "Standard" msgstr "" @@ -1807,18 +1848,18 @@ msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:185 +#: src/states_screens/options_screen_input2.cpp:184 msgid "Steer Left" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:188 +#: src/states_screens/options_screen_input2.cpp:187 msgid "Steer Right" msgstr "" #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:673 +#: data/po/gui_strings.h:681 msgid "Story Mode" msgstr "" @@ -1837,7 +1878,7 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: ./data/gui/help1.stkgui #: data/po/gui_strings.h:142 data/po/gui_strings.h:293 -#: data/po/gui_strings.h:444 data/po/gui_strings.h:727 +#: data/po/gui_strings.h:444 data/po/gui_strings.h:735 msgid "SuperTuxKart Help" msgstr "" @@ -1849,7 +1890,7 @@ #. I18N: ./data/gui/options_ui.stkgui #: data/po/gui_strings.h:337 data/po/gui_strings.h:368 #: data/po/gui_strings.h:429 data/po/gui_strings.h:498 -#: data/po/gui_strings.h:572 data/po/gui_strings.h:649 +#: data/po/gui_strings.h:572 data/po/gui_strings.h:657 msgid "SuperTuxKart Options" msgstr "" @@ -1863,7 +1904,7 @@ msgid "SuperTuxKart features several game modes" msgstr "" -#: src/main.cpp:1397 +#: src/main.cpp:1420 msgid "" "SuperTuxKart may connect to a server to download add-ons and notify you of " "updates. Would you like this feature to be enabled? (To change this setting " @@ -1872,7 +1913,7 @@ msgstr "" #. I18N: ./data/karts/suzanne/kart.xml -#: data/po/gui_strings.h:855 +#: data/po/gui_strings.h:863 msgid "Suzanne" msgstr "" @@ -1889,7 +1930,7 @@ msgstr "" #. I18N: in the language choice, to select the same language as the OS -#: src/states_screens/options_screen_ui.cpp:163 +#: src/states_screens/options_screen_ui.cpp:162 msgid "System Language" msgstr "" @@ -1901,7 +1942,7 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: in the help menu -#: data/po/gui_strings.h:766 +#: data/po/gui_strings.h:774 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost." msgstr "" @@ -1919,7 +1960,7 @@ msgid "The Stadium" msgstr "" -#: src/states_screens/main_menu_screen.cpp:381 +#: src/states_screens/main_menu_screen.cpp:390 msgid "The add-ons module is currently disabled in the Options screen" msgstr "" @@ -1963,7 +2004,7 @@ msgstr "" #. I18N: ./data/grandprix/3_tothemoonandback.grandprix -#: data/po/gui_strings.h:116 data/po/gui_strings.h:810 +#: data/po/gui_strings.h:116 data/po/gui_strings.h:818 msgid "To the moon and back" msgstr "" @@ -1981,18 +2022,18 @@ #. I18N: ./data/gui/addons_screen.stkgui #. I18N: Section in the addons menu -#: data/po/gui_strings.h:605 +#: data/po/gui_strings.h:613 msgid "Tracks" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:322 -#: src/states_screens/dialogs/addons_loading.cpp:362 +#: src/states_screens/dialogs/addons_loading.cpp:338 +#: src/states_screens/dialogs/addons_loading.cpp:378 msgid "Try again" msgstr "" #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: src/states_screens/race_gui_overworld.cpp:447 data/po/gui_strings.h:697 +#: src/states_screens/race_gui_overworld.cpp:448 data/po/gui_strings.h:705 msgid "Tutorial" msgstr "" @@ -2003,7 +2044,7 @@ msgstr "" #. I18N: ./data/karts/tux/kart.xml -#: data/po/gui_strings.h:849 +#: data/po/gui_strings.h:857 msgid "Tux" msgstr "" @@ -2015,20 +2056,26 @@ #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-on screen action -#: data/po/gui_strings.h:778 +#: data/po/gui_strings.h:786 msgid "Uninstall" msgstr "" #. I18N: Key binding name -#: src/states_screens/options_screen_input2.cpp:217 +#: src/states_screens/options_screen_input2.cpp:216 msgid "Up" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:94 +#: src/states_screens/dialogs/addons_loading.cpp:96 msgid "Update" msgstr "" -#: src/states_screens/addons_screen.cpp:85 +#. I18N: ./data/gui/addons_screen.stkgui +#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items +#: data/po/gui_strings.h:601 +msgid "Updated" +msgstr "" + +#: src/states_screens/addons_screen.cpp:108 msgid "Updated date" msgstr "" @@ -2052,10 +2099,10 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: Section in the settings menu #: src/states_screens/options_screen_input.cpp:138 -#: src/states_screens/options_screen_audio.cpp:65 -#: src/states_screens/options_screen_input2.cpp:73 +#: src/states_screens/options_screen_audio.cpp:64 +#: src/states_screens/options_screen_input2.cpp:72 #: src/states_screens/options_screen_video.cpp:88 -#: src/states_screens/options_screen_players.cpp:73 data/po/gui_strings.h:653 +#: src/states_screens/options_screen_players.cpp:72 data/po/gui_strings.h:661 msgid "User Interface" msgstr "" @@ -2064,7 +2111,7 @@ msgid "VS" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:106 +#: src/states_screens/dialogs/addons_loading.cpp:108 #, c-format msgid "Version: %d" msgstr "" @@ -2083,11 +2130,11 @@ msgid "Volume" msgstr "" -#: src/modes/linear_world.cpp:873 +#: src/modes/linear_world.cpp:875 msgid "WRONG WAY!" msgstr "" -#: src/states_screens/options_screen_input2.cpp:409 +#: src/states_screens/options_screen_input2.cpp:410 msgid "" "Warning, 'Shift' is not a recommended key : when shift is pressed down, all " "keys that contain a character that is different in upper-case will stop " @@ -2103,7 +2150,7 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: Tab in help menu #: data/po/gui_strings.h:150 data/po/gui_strings.h:301 -#: data/po/gui_strings.h:452 data/po/gui_strings.h:735 +#: data/po/gui_strings.h:452 data/po/gui_strings.h:743 msgid "Weapons" msgstr "" @@ -2138,7 +2185,7 @@ msgstr "" #. I18N: ./data/karts/wilber/kart.xml -#: data/po/gui_strings.h:846 +#: data/po/gui_strings.h:854 msgid "Wilber" msgstr "" @@ -2166,6 +2213,7 @@ msgid "You cannot delete this player because it is currently in use." msgstr "" +#: src/states_screens/grand_prix_win.cpp:104 #: src/states_screens/race_result_gui.cpp:104 msgid "You completed a challenge!" msgstr "" @@ -2194,24 +2242,20 @@ "You completed the intermediate challenge! This trophy is worth %i points" msgstr "" -#: src/karts/kart.cpp:794 src/karts/kart.cpp:811 +#: src/karts/kart.cpp:798 src/karts/kart.cpp:815 msgid "You finished the race!" msgstr "" -#: src/modes/world.cpp:1001 +#: src/modes/world.cpp:1005 msgid "You have been eliminated!" msgstr "" -#: src/karts/kart.cpp:1647 +#: src/karts/kart.cpp:1666 msgid "" "You need more points\n" "to enter this challenge!" msgstr "" -#: src/states_screens/grand_prix_win.cpp:104 -msgid "You unlocked a new feature!" -msgstr "" - #: src/states_screens/feature_unlocked.cpp:649 msgid "You unlocked grand prix %0" msgstr "" @@ -2220,23 +2264,23 @@ msgid "You unlocked track %0" msgstr "" -#: src/karts/kart.cpp:794 src/karts/kart.cpp:811 +#: src/karts/kart.cpp:798 src/karts/kart.cpp:815 msgid "You won the race!" msgstr "" -#: src/config/user_config.cpp:596 +#: src/config/user_config.cpp:655 msgid "" "Your config file was malformed, so it was deleted and a new one will be " "created." msgstr "" -#: src/config/user_config.cpp:606 +#: src/config/user_config.cpp:665 msgid "" "Your config file was too old, so it was deleted and a new one will be " "created." msgstr "" -#: src/input/device_manager.cpp:481 +#: src/input/device_manager.cpp:482 msgid "Your input config file is not compatible with this version of STK." msgstr "" @@ -2246,7 +2290,7 @@ msgstr "" #. I18N: Unbound key binding -#: src/input/binding.cpp:87 +#: src/input/binding.cpp:100 msgid "[none]" msgstr "" @@ -2255,10 +2299,14 @@ msgid "by" msgstr "" -#: src/states_screens/dialogs/addons_loading.cpp:139 +#: src/states_screens/dialogs/addons_loading.cpp:138 msgid "featured" msgstr "" +#: src/input/binding.cpp:283 +msgid "inverted" +msgstr "" + #. I18N: ./data/tracks/alpha-planetarium/track.xml #: data/po/gui_strings.h:29 msgid "planetarium" @@ -2268,11 +2316,11 @@ #. I18N: kart group name #. I18N: arena group name #: src/states_screens/tracks_screen.cpp:174 -#: src/states_screens/kart_selection.cpp:1032 +#: src/states_screens/kart_selection.cpp:1030 #: src/states_screens/arenas_screen.cpp:79 msgid "standard" msgstr "" -#: src/states_screens/credits.cpp:213 +#: src/states_screens/credits.cpp:212 msgid "translator-credits" msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-09-20 00:22:44
|
Revision: 14110 http://sourceforge.net/p/supertuxkart/code/14110 Author: auria Date: 2013-09-20 00:22:41 +0000 (Fri, 20 Sep 2013) Log Message: ----------- Add XFCE mouse kart Modified Paths: -------------- main/trunk/data/CREDITS Added Paths: ----------- main/trunk/data/karts/xfcemouse/ main/trunk/data/karts/xfcemouse/License.txt main/trunk/data/karts/xfcemouse/hc_body.png main/trunk/data/karts/xfcemouse/kart.xml main/trunk/data/karts/xfcemouse/materials.xml main/trunk/data/karts/xfcemouse/mouse_texture.png main/trunk/data/karts/xfcemouse/shadow.png main/trunk/data/karts/xfcemouse/skirt.png main/trunk/data/karts/xfcemouse/xfce mouse.b3d main/trunk/data/karts/xfcemouse/xfce_icon32.png main/trunk/data/karts/xfcemouse/xfce_icon64.png Modified: main/trunk/data/CREDITS =================================================================== --- main/trunk/data/CREDITS 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/CREDITS 2013-09-20 00:22:41 UTC (rev 14110) @@ -80,6 +80,9 @@ +++ @@ -106,7 +109,7 @@ -+ Added: main/trunk/data/karts/xfcemouse/License.txt =================================================================== --- main/trunk/data/karts/xfcemouse/License.txt (rev 0) +++ main/trunk/data/karts/xfcemouse/License.txt 2013-09-20 00:22:41 UTC (rev 14110) @@ -0,0 +1,21 @@ +Mouse kart BETA v0.6 by JunglePenguin for SuperTuxKart + +Release license : CC-BY-SA 3.0 (see http://creativecommons.org/licenses/by-sa/3.0/) + Please contact me for any use which is not allowed by this license. + +Use of the Xfce logo is possible under LGPL +http://www.xfce.org/about/credits + +Contact : JunglePenguin @ http://forum.freegamedev.net/ + Kart tread @ http://forum.freegamedev.net/viewtopic.php?f=18&t=4753 + js at junglepenguin dot nl + +-- +Changelog : + v0.5 is first BETA version available to the public + v0.6 added shadow.png + changed name to Xfce mouse + +ToDo : + Win/Lose animation + \ No newline at end of file Property changes on: main/trunk/data/karts/xfcemouse/License.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/hc_body.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/xfcemouse/hc_body.png =================================================================== --- main/trunk/data/karts/xfcemouse/hc_body.png 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/karts/xfcemouse/hc_body.png 2013-09-20 00:22:41 UTC (rev 14110) Property changes on: main/trunk/data/karts/xfcemouse/hc_body.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/kart.xml =================================================================== --- main/trunk/data/karts/xfcemouse/kart.xml (rev 0) +++ main/trunk/data/karts/xfcemouse/kart.xml 2013-09-20 00:22:41 UTC (rev 14110) @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<kart name="Xfce mouse" version="2" model-file="xfce mouse.b3d" icon-file="xfce_icon64.png" minimap-icon-file="xfce_icon32.png" shadow-file="shadow.png" random-wheel-rot="true" center-shift="0.30" groups="Add-Ons" rgb="0.03 0.40 1.00" revision="2"> + <sounds engine="large"/> + <animations left="19" straight="39" right="59" start-winning="79" start-winning-loop="159" end-winning="189" start-losing="219" start-losing-loop="259" end-losing="289"/> + <wheels/> +</kart> Property changes on: main/trunk/data/karts/xfcemouse/kart.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/materials.xml =================================================================== --- main/trunk/data/karts/xfcemouse/materials.xml (rev 0) +++ main/trunk/data/karts/xfcemouse/materials.xml 2013-09-20 00:22:41 UTC (rev 14110) @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<!-- Generated with script from SVN rev Unknown --> +<materials> +</materials> Property changes on: main/trunk/data/karts/xfcemouse/materials.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/mouse_texture.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/xfcemouse/mouse_texture.png =================================================================== --- main/trunk/data/karts/xfcemouse/mouse_texture.png 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/karts/xfcemouse/mouse_texture.png 2013-09-20 00:22:41 UTC (rev 14110) Property changes on: main/trunk/data/karts/xfcemouse/mouse_texture.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/shadow.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/xfcemouse/shadow.png =================================================================== --- main/trunk/data/karts/xfcemouse/shadow.png 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/karts/xfcemouse/shadow.png 2013-09-20 00:22:41 UTC (rev 14110) Property changes on: main/trunk/data/karts/xfcemouse/shadow.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/skirt.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/xfcemouse/skirt.png =================================================================== --- main/trunk/data/karts/xfcemouse/skirt.png 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/karts/xfcemouse/skirt.png 2013-09-20 00:22:41 UTC (rev 14110) Property changes on: main/trunk/data/karts/xfcemouse/skirt.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/xfce mouse.b3d =================================================================== (Binary files differ) Index: main/trunk/data/karts/xfcemouse/xfce mouse.b3d =================================================================== --- main/trunk/data/karts/xfcemouse/xfce mouse.b3d 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/karts/xfcemouse/xfce mouse.b3d 2013-09-20 00:22:41 UTC (rev 14110) Property changes on: main/trunk/data/karts/xfcemouse/xfce mouse.b3d ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/xfce_icon32.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/xfcemouse/xfce_icon32.png =================================================================== --- main/trunk/data/karts/xfcemouse/xfce_icon32.png 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/karts/xfcemouse/xfce_icon32.png 2013-09-20 00:22:41 UTC (rev 14110) Property changes on: main/trunk/data/karts/xfcemouse/xfce_icon32.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: main/trunk/data/karts/xfcemouse/xfce_icon64.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/xfcemouse/xfce_icon64.png =================================================================== --- main/trunk/data/karts/xfcemouse/xfce_icon64.png 2013-09-20 00:14:24 UTC (rev 14109) +++ main/trunk/data/karts/xfcemouse/xfce_icon64.png 2013-09-20 00:22:41 UTC (rev 14110) Property changes on: main/trunk/data/karts/xfcemouse/xfce_icon64.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-09-21 00:42:05
|
Revision: 14119 http://sourceforge.net/p/supertuxkart/code/14119 Author: auria Date: 2013-09-21 00:42:01 +0000 (Sat, 21 Sep 2013) Log Message: ----------- Update ingame documentation for new bubblegum. Update translation files, fixing invalid XML files Modified Paths: -------------- main/trunk/data/gui/help2.stkgui main/trunk/data/gui/options_audio.stkgui main/trunk/data/karts/adiumy/kart.xml main/trunk/data/karts/beagle/kart.xml main/trunk/data/karts/beastie/kart.xml main/trunk/data/karts/elephpant/kart.xml main/trunk/data/karts/emule/kart.xml main/trunk/data/karts/hexley/kart.xml main/trunk/data/karts/konqi/kart.xml main/trunk/data/karts/pidgin/kart.xml main/trunk/data/karts/puffy/kart.xml main/trunk/data/karts/sara/kart.xml main/trunk/data/karts/suzanne/kart.xml main/trunk/data/karts/tux/kart.xml main/trunk/data/karts/wilber/kart.xml main/trunk/data/po/supertuxkart.pot Modified: main/trunk/data/gui/help2.stkgui =================================================================== --- main/trunk/data/gui/help2.stkgui 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/gui/help2.stkgui 2013-09-21 00:42:01 UTC (rev 14119) @@ -23,7 +23,7 @@ -+ Modified: main/trunk/data/gui/options_audio.stkgui =================================================================== --- main/trunk/data/gui/options_audio.stkgui 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/gui/options_audio.stkgui 2013-09-21 00:42:01 UTC (rev 14119) @@ -5,7 +5,7 @@ <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <spacer height="15" width="10"/> - <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%"" align="center"> + <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center"> <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/> <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png" I18N="Section in the settings menu" text="Audio"/> Modified: main/trunk/data/karts/adiumy/kart.xml =================================================================== --- main/trunk/data/karts/adiumy/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/adiumy/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -32,5 +32,5 @@ <nitro-emitter-a position = "0.203126 0.391161 -0.397603" /> <nitro-emitter-b position = "-0.226106 0.391161 -0.397603" /> </nitro-emitter> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/beagle/kart.xml =================================================================== --- main/trunk/data/karts/beagle/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/beagle/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -33,5 +33,5 @@ <nitro-emitter-a position = "0.163643 0.267224 -0.698970" /> <nitro-emitter-b position = "-0.162629 0.267224 -0.698970" /> </nitro-emitter> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/beastie/kart.xml =================================================================== --- main/trunk/data/karts/beastie/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/beastie/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -33,5 +33,5 @@ <nitro-emitter-a position = "0.387257 0.615989 -0.635706" /> <nitro-emitter-b position = "-0.382115 0.615989 -0.635706" /> </nitro-emitter> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/elephpant/kart.xml =================================================================== --- main/trunk/data/karts/elephpant/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/elephpant/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -26,5 +26,5 @@ <rear-right position = "0.377162 0.139018 -0.470212" model = "wheel-rear-right.b3d" /> </wheels> - <hat offset = "0.0 1.2 0.0"> + <hat offset = "0.0 1.2 0.0"/> </kart> Modified: main/trunk/data/karts/emule/kart.xml =================================================================== --- main/trunk/data/karts/emule/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/emule/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -34,5 +34,5 @@ <nitro-emitter-a position = "0.255852 0.362264 -0.586941" /> <nitro-emitter-b position = "-0.250476 0.362264 -0.586941" /> </nitro-emitter> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/hexley/kart.xml =================================================================== --- main/trunk/data/karts/hexley/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/hexley/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -25,5 +25,5 @@ <rear-right position = "0.340563 0.116514 -0.323795" model = "wheel-rear-right.b3d" /> </wheels> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/konqi/kart.xml =================================================================== --- main/trunk/data/karts/konqi/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/konqi/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -33,5 +33,5 @@ <nitro-emitter-a position = "0.059507 0.116539 -0.770299" /> <nitro-emitter-b position = "-0.059968 0.116539 -0.770299" /> </nitro-emitter> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/pidgin/kart.xml =================================================================== --- main/trunk/data/karts/pidgin/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/pidgin/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -29,5 +29,5 @@ <rear-right position = "0.398760 0.170913 -0.438000" model = "wheel-rear-right.b3d" /> </wheels> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/puffy/kart.xml =================================================================== --- main/trunk/data/karts/puffy/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/puffy/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -27,5 +27,5 @@ <rear-right position = "0.396947 0.221235 -0.471024" model = "wheel-rear-right.b3d" /> </wheels> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/sara/kart.xml =================================================================== --- main/trunk/data/karts/sara/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/sara/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -27,5 +27,5 @@ <nitro-emitter-a position = "0.178296 0.213328 -0.480724" /> <nitro-emitter-b position = "-0.178441 0.213328 -0.480724" /> </nitro-emitter> - <hat offset = "0.0 1.15 0.0"> + <hat offset = "0.0 1.15 0.0"/> </kart> Modified: main/trunk/data/karts/suzanne/kart.xml =================================================================== --- main/trunk/data/karts/suzanne/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/suzanne/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -33,5 +33,5 @@ <nitro-emitter-a position = "0.228313 0.452646 -0.680885" /> <nitro-emitter-b position = "-0.215846 0.452646 -0.680885" /> </nitro-emitter> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/tux/kart.xml =================================================================== --- main/trunk/data/karts/tux/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/tux/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -32,5 +32,5 @@ <nitro-emitter-a position = "0.224117 0.329109 -0.685808" /> <nitro-emitter-b position = "-0.195588 0.329109 -0.685808" /> </nitro-emitter> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/karts/wilber/kart.xml =================================================================== --- main/trunk/data/karts/wilber/kart.xml 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/karts/wilber/kart.xml 2013-09-21 00:42:01 UTC (rev 14119) @@ -28,5 +28,5 @@ <rear-right position = "0.390992 0.133159 -0.318699" model = "wheel-rear-right.b3d" /> </wheels> - <hat offset = "0.0 1.0 0.0"> + <hat offset = "0.0 1.0 0.0"/> </kart> Modified: main/trunk/data/po/supertuxkart.pot =================================================================== --- main/trunk/data/po/supertuxkart.pot 2013-09-21 00:24:01 UTC (rev 14118) +++ main/trunk/data/po/supertuxkart.pot 2013-09-21 00:42:01 UTC (rev 14119) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: supertuxkart\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-01 19:11-0400\n" +"POT-Creation-Date: 2013-09-20 20:41-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -26,19 +26,19 @@ #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:101 data/po/gui_strings.h:104 +#: data/po/gui_strings.h:98 data/po/gui_strings.h:101 msgid "" " But you pathetic little twerps will never be able to beat me - King of the " "Karts!" msgstr "" #. I18N: shown when hit by plunger. %0 is the victim, %1 is the attacker -#: src/items/rubber_band.cpp:47 +#: src/items/rubber_band.cpp:49 msgid "%0 bites %1's bait" msgstr "" #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim. -#: src/items/cake.cpp:149 +#: src/items/cake.cpp:151 msgid "%0 eats too much of %1's cake" msgstr "" @@ -49,23 +49,23 @@ #. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is #. the victim. -#: src/items/bowling.cpp:118 +#: src/items/bowling.cpp:120 msgid "%0 is bowled over by %1" msgstr "" #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim. -#: src/items/cake.cpp:151 +#: src/items/cake.cpp:153 msgid "%0 is dubious of %1's cooking skills" msgstr "" #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim. -#: src/items/cake.cpp:153 +#: src/items/cake.cpp:155 msgid "%0 should not play with %1's lunch" msgstr "" #. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is #. the victim. -#: src/items/bowling.cpp:112 +#: src/items/bowling.cpp:114 msgid "%0 will not go bowling with %1 again" msgstr "" @@ -75,7 +75,7 @@ msgstr "" #. I18N: shown when hit by plunger. %0 is the victim, %1 is the attacker -#: src/items/rubber_band.cpp:49 +#: src/items/rubber_band.cpp:51 msgid "%1 latches onto %0 for a free ride" msgstr "" @@ -85,18 +85,18 @@ msgstr "" #. I18N: shown when hit by cake. %1 is the attacker, %0 is the victim. -#: src/items/cake.cpp:155 +#: src/items/cake.cpp:157 msgid "%1 ruins %0's cakeless diet" msgstr "" #. I18N: shown when hit by bowling ball. %1 is the attacker, %0 is #. the victim. -#: src/items/bowling.cpp:115 +#: src/items/bowling.cpp:117 msgid "%1 strikes %0" msgstr "" #. I18N: shown when hit by plunger. %0 is the victim, %1 is the attacker -#: src/items/rubber_band.cpp:51 +#: src/items/rubber_band.cpp:53 msgid "%1 tests a tractor beam on %0" msgstr "" @@ -107,13 +107,13 @@ #. I18N: ./data/gui/track_info_dialog.stkgui #. I18N: In the track setup screen (number of laps choice, where %i is the number) -#: data/po/gui_strings.h:136 +#: data/po/gui_strings.h:133 #, c-format msgid "%i laps" msgstr "" #. I18N: as in: The Old Island by Johannes Sjolund -#: src/states_screens/addons_screen.cpp:312 +#: src/states_screens/addons_screen.cpp:314 #, c-format msgid "" "%s\n" @@ -132,7 +132,7 @@ msgstr "" #. I18N: as in: The Old Island by Johannes Sjolund -#: src/states_screens/addons_screen.cpp:302 +#: src/states_screens/addons_screen.cpp:304 #, c-format msgctxt "addons" msgid "%s by %s" @@ -158,13 +158,13 @@ #. I18N: shown when a player is hit by a rubber ball. %1 is the #. attacker, %0 is the victim. -#: src/items/rubber_ball.cpp:307 +#: src/items/rubber_ball.cpp:310 #, c-format msgid "%s is being bounced around." msgstr "" #. I18N: shown when hit by own bowling ball. %s is the kart. -#: src/items/bowling.cpp:128 +#: src/items/bowling.cpp:130 #, c-format msgid "%s is practicing with a blue, big, spheric yo-yo" msgstr "" @@ -175,7 +175,7 @@ msgstr "" #. I18N: shown when hit by own bowling ball. %s is the kart. -#: src/items/bowling.cpp:130 +#: src/items/bowling.cpp:132 #, c-format msgid "%s is the world master of the boomerang ball" msgstr "" @@ -186,12 +186,12 @@ msgstr "" #. I18N: shown when hit by own bowling ball. %s is the kart. -#: src/items/bowling.cpp:132 +#: src/items/bowling.cpp:134 #, c-format msgid "%s should play (rubber) darts instead of bowling" msgstr "" -#: src/modes/world.cpp:1008 +#: src/modes/world.cpp:1028 #, c-format msgid "'%s' has been eliminated." msgstr "" @@ -199,13 +199,13 @@ #. I18N: for empty highscores entries #. I18N: ./data/gui/track_info_dialog.stkgui #: src/states_screens/dialogs/track_info_dialog.cpp:226 -#: data/po/gui_strings.h:122 data/po/gui_strings.h:125 -#: data/po/gui_strings.h:128 +#: data/po/gui_strings.h:119 data/po/gui_strings.h:122 +#: data/po/gui_strings.h:125 msgid "(Empty)" msgstr "" #. I18N: ./data/gui/help4.stkgui -#: data/po/gui_strings.h:315 +#: data/po/gui_strings.h:312 msgid "(network play is not yet available)" msgstr "" @@ -215,13 +215,13 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: in the help screen -#: data/po/gui_strings.h:778 +#: data/po/gui_strings.h:771 msgid "* Current key bindings can be seen/changed in menu Options" msgstr "" #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:483 +#: data/po/gui_strings.h:480 msgid "" "* Most of these game modes can also be played in a Grand Prix fashion: " "instead of playing a single race, you play many in a row. The better you " @@ -230,7 +230,7 @@ msgstr "" #. I18N: ./data/gui/options_input.stkgui -#: data/po/gui_strings.h:587 +#: data/po/gui_strings.h:584 msgid "" "* Which config to use will be inferred from which 'fire' key is pressed to " "join the game." @@ -263,7 +263,7 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:479 +#: data/po/gui_strings.h:476 msgid "" "3 Strikes Battle: only in multiplayer games. Hit others with weapons until " "they lose all their lives." @@ -282,7 +282,7 @@ msgstr "" #. I18N: ./data/gui/track_info_dialog.stkgui -#: data/po/gui_strings.h:119 +#: data/po/gui_strings.h:116 msgid "= Highscores =" msgstr "" @@ -290,13 +290,13 @@ msgid "A wizard did it!" msgstr "" -#: src/states_screens/race_result_gui.cpp:118 +#: src/states_screens/race_result_gui.cpp:119 msgid "Abort Grand Prix" msgstr "" #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:709 +#: data/po/gui_strings.h:702 msgid "About" msgstr "" @@ -305,14 +305,14 @@ msgid "Accelerate" msgstr "" -#: src/tracks/track_object_presentation.cpp:662 +#: src/tracks/track_object_presentation.cpp:667 #, c-format msgid "" "Accelerate and press the <%s> key while turning to skid. Skidding for a " "short while can help you turn faster to take sharp turns." msgstr "" -#: src/tracks/track_object_presentation.cpp:605 +#: src/tracks/track_object_presentation.cpp:610 #, c-format msgid "Accelerate with <%s> and steer with <%s> and <%s>" msgstr "" @@ -324,7 +324,7 @@ #. I18N: ./data/gui/options_players.stkgui #. I18N: In players configuration menu -#: data/po/gui_strings.h:513 +#: data/po/gui_strings.h:510 msgid "Add Player" msgstr "" @@ -335,7 +335,7 @@ #. I18N: ./data/gui/options_input.stkgui #. I18N: In the input configuration screen -#: data/po/gui_strings.h:584 +#: data/po/gui_strings.h:581 msgid "Add a device" msgstr "" @@ -346,7 +346,7 @@ #. I18N: track group #: src/states_screens/tracks_screen.cpp:176 #: src/states_screens/kart_selection.cpp:1032 -#: src/states_screens/arenas_screen.cpp:81 data/po/gui_strings.h:802 +#: src/states_screens/arenas_screen.cpp:81 data/po/gui_strings.h:795 msgid "Add-Ons" msgstr "" @@ -356,12 +356,12 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:693 +#: data/po/gui_strings.h:686 msgid "Addons" msgstr "" #. I18N: ./data/karts/adiumy/kart.xml -#: data/po/gui_strings.h:845 +#: data/po/gui_strings.h:841 msgid "Adiumy" msgstr "" @@ -373,26 +373,26 @@ #. I18N: ./data/gui/arenas.stkgui #. I18N: track group #: src/states_screens/tracks_screen.cpp:168 -#: src/states_screens/options_screen_video.cpp:354 +#: src/states_screens/options_screen_video.cpp:353 #: src/states_screens/kart_selection.cpp:1024 #: src/states_screens/addons_screen.cpp:46 -#: src/states_screens/arenas_screen.cpp:73 data/po/gui_strings.h:806 +#: src/states_screens/arenas_screen.cpp:73 data/po/gui_strings.h:799 msgid "All" msgstr "" #. I18N: ./data/gui/tracks.stkgui #. I18N: Section in track selection screen -#: data/po/gui_strings.h:732 +#: data/po/gui_strings.h:725 msgid "All Tracks" msgstr "" -#: src/states_screens/race_setup_screen.cpp:248 +#: src/states_screens/race_setup_screen.cpp:259 msgid "All blows allowed, so catch weapons and make clever use of them!" msgstr "" #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:673 +#: data/po/gui_strings.h:666 msgid "Allow STK to connect to the Internet" msgstr "" @@ -402,49 +402,49 @@ msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:180 +#: data/po/gui_strings.h:177 msgid "Anchor - slows down greatly the kart in the first position." msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:235 +#: data/po/gui_strings.h:232 msgid "Animated Characters" msgstr "" #. I18N: in graphical options -#: src/states_screens/options_screen_video.cpp:380 +#: src/states_screens/options_screen_video.cpp:379 #, c-format msgid "Animated Characters : %s" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:227 +#: data/po/gui_strings.h:224 msgid "Animated Scenery" msgstr "" #. I18N: in graphical options -#: src/states_screens/options_screen_video.cpp:374 +#: src/states_screens/options_screen_video.cpp:373 #, c-format msgid "Animated Scenery : %s" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:243 +#: data/po/gui_strings.h:240 msgid "Anti-aliasing (requires restart)" msgstr "" #. I18N: in graphical options -#: src/states_screens/options_screen_video.cpp:385 +#: src/states_screens/options_screen_video.cpp:384 #, c-format msgid "Anti-aliasing (requires restart) : %s" msgstr "" #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings menu -#: data/po/gui_strings.h:404 +#: data/po/gui_strings.h:401 msgid "Apply new resolution" msgstr "" @@ -457,7 +457,7 @@ #. I18N: Section in the addons menu #. I18N: ./data/gui/arenas.stkgui #. I18N: Section in arena tracks selection screen -#: data/po/gui_strings.h:617 data/po/gui_strings.h:794 +#: data/po/gui_strings.h:610 data/po/gui_strings.h:787 msgid "Arenas" msgstr "" @@ -474,12 +474,12 @@ #. I18N: ./data/gui/press_a_key_dialog.stkgui #. I18N: When configuring input -#: data/po/gui_strings.h:720 +#: data/po/gui_strings.h:713 msgid "Assign to ESC key" msgstr "" #. I18N: ./data/grandprix/4_atworldsend.grandprix -#: data/po/gui_strings.h:107 data/po/gui_strings.h:809 +#: data/po/gui_strings.h:104 data/po/gui_strings.h:802 msgid "At World's End" msgstr "" @@ -489,13 +489,13 @@ #: src/states_screens/options_screen_input2.cpp:71 #: src/states_screens/options_screen_video.cpp:87 #: src/states_screens/options_screen_ui.cpp:112 -#: src/states_screens/options_screen_players.cpp:71 data/po/gui_strings.h:341 +#: src/states_screens/options_screen_players.cpp:71 data/po/gui_strings.h:338 msgid "Audio" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: src/tracks/track_object_presentation.cpp:613 data/po/gui_strings.h:762 +#: src/tracks/track_object_presentation.cpp:618 data/po/gui_strings.h:755 msgid "Avoid bananas!" msgstr "" @@ -506,39 +506,39 @@ #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-ons screen action -#: src/states_screens/dialogs/addons_loading.cpp:260 data/po/gui_strings.h:790 +#: src/states_screens/dialogs/addons_loading.cpp:260 data/po/gui_strings.h:783 msgid "Back" msgstr "" #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:520 +#: data/po/gui_strings.h:517 msgid "Back to Game" msgstr "" #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:627 +#: data/po/gui_strings.h:620 msgid "Back to Race" msgstr "" -#: src/states_screens/race_result_gui.cpp:134 +#: src/states_screens/race_result_gui.cpp:135 msgid "Back to challenge selection" msgstr "" #. I18N: ./data/gui/options_device.stkgui #. I18N: In the input configuration screen -#: data/po/gui_strings.h:441 +#: data/po/gui_strings.h:438 msgid "Back to device list" msgstr "" #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:536 +#: data/po/gui_strings.h:533 msgid "Back to menu" msgstr "" -#: src/states_screens/race_result_gui.cpp:140 +#: src/states_screens/race_result_gui.cpp:141 msgid "Back to the menu" msgstr "" @@ -547,7 +547,7 @@ msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:186 +#: data/po/gui_strings.h:183 msgid "" "Basket Ball - bounces after the leader, and might squash and slow down karts " "down on the way." @@ -559,12 +559,12 @@ msgstr "" #. I18N: ./data/karts/beagle/kart.xml -#: data/po/gui_strings.h:821 +#: data/po/gui_strings.h:814 msgid "Beagle" msgstr "" #. I18N: ./data/karts/beastie/kart.xml -#: data/po/gui_strings.h:833 +#: data/po/gui_strings.h:829 msgid "Beastie" msgstr "" @@ -574,17 +574,21 @@ msgstr "" #. I18N: ./data/tracks/mansion/track.xml -#: data/po/gui_strings.h:47 +#: data/po/gui_strings.h:44 msgid "Blackhill Mansion" msgstr "" +#: src/states_screens/race_result_gui.cpp:813 +msgid "Blue team won" +msgstr "" + #. I18N: ./data/tracks/farm/track.xml -#: data/po/gui_strings.h:59 +#: data/po/gui_strings.h:56 msgid "Bovine Barnyard" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:174 +#: data/po/gui_strings.h:171 msgid "" "Bowling Ball - bounces off walls. If you are looking back, it will be thrown " "backwards." @@ -596,31 +600,33 @@ msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:165 -msgid "BubbleGum - leave a sticky pink puddle behind you." +#: data/po/gui_strings.h:162 +msgid "" +"BubbleGum - protect yourself with a shield, or use while looking back to " +"leave a sticky pink puddle behind you." msgstr "" #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:89 data/po/gui_strings.h:92 +#: data/po/gui_strings.h:86 data/po/gui_strings.h:89 msgid "But I'm a fair creature, so I'll make you a deal." msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:168 +#: data/po/gui_strings.h:165 msgid "" "Cake - thrown at the closest rival, best on short ranges and long straights." msgstr "" -#: src/addons/news_manager.cpp:149 src/addons/network_http.cpp:440 +#: src/addons/news_manager.cpp:149 src/addons/network_http.cpp:432 msgid "Can't access stkaddons server..." msgstr "" -#: src/addons/network_http.cpp:347 +#: src/addons/network_http.cpp:339 msgid "Can't download addons list, check terminal for details." msgstr "" -#: src/addons/network_http.cpp:357 +#: src/addons/network_http.cpp:349 msgid "Can't download news file, check terminal for details." msgstr "" @@ -631,8 +637,8 @@ #. I18N: ./data/gui/story_mode_new.stkgui #: src/states_screens/dialogs/add_device_dialog.cpp:128 #: src/states_screens/dialogs/player_info_dialog.cpp:106 -#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:216 -#: data/po/gui_strings.h:491 data/po/gui_strings.h:561 +#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:213 +#: data/po/gui_strings.h:488 data/po/gui_strings.h:558 msgid "Cancel" msgstr "" @@ -660,55 +666,55 @@ msgid "Challenge Completed" msgstr "" -#: src/states_screens/race_gui.cpp:246 src/states_screens/race_gui.cpp:248 +#: src/states_screens/race_gui.cpp:320 src/states_screens/race_gui.cpp:322 msgid "Challenge Failed" msgstr "" #. I18N: ./data/gui/challenges.stkgui #. I18N: Title for challenges screen -#: data/po/gui_strings.h:327 +#: data/po/gui_strings.h:324 msgid "Challenges : Trophy Room" msgstr "" #. I18N: ./data/gui/karts.stkgui #. I18N: In the kart selection (player setup) screen -#: data/po/gui_strings.h:426 +#: data/po/gui_strings.h:423 msgid "Choose a Kart" msgstr "" #. I18N: ./data/gui/help1.stkgui -#: data/po/gui_strings.h:754 +#: data/po/gui_strings.h:747 msgid "Click here to play the tutorial" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui -#: data/po/gui_strings.h:254 +#: data/po/gui_strings.h:251 msgid "Close" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:758 +#: data/po/gui_strings.h:751 msgid "Collect blue boxes : they will give you weapons or other powerups" msgstr "" -#: src/tracks/track_object_presentation.cpp:622 +#: src/tracks/track_object_presentation.cpp:627 #, c-format msgid "" "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!" msgstr "" -#: src/tracks/track_object_presentation.cpp:629 +#: src/tracks/track_object_presentation.cpp:634 msgid "Collect nitro bottles (we will use them after the curve)" msgstr "" -#: src/states_screens/race_gui_base.cpp:717 +#: src/states_screens/race_gui_base.cpp:730 msgid "Collect nitro!" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:766 +#: data/po/gui_strings.h:759 msgid "" "Collecting nitro allows you to get speed boosts whenever you wish by " "pressing the appropriate key. You can see your current level of nitro in the " @@ -726,7 +732,7 @@ msgid "Confirm resolution within %i seconds" msgstr "" -#: src/states_screens/race_setup_screen.cpp:255 +#: src/states_screens/race_setup_screen.cpp:266 msgid "Contains no powerups, so only your driving skills matter!" msgstr "" @@ -737,9 +743,9 @@ #. I18N: ./data/gui/grand_prix_win.stkgui #. I18N: ./data/gui/feature_unlocked.stkgui #. I18N: ./data/gui/grand_prix_lose.stkgui -#: src/states_screens/race_result_gui.cpp:115 data/po/gui_strings.h:220 -#: data/po/gui_strings.h:422 data/po/gui_strings.h:590 -#: data/po/gui_strings.h:620 data/po/gui_strings.h:654 +#: src/states_screens/race_result_gui.cpp:116 data/po/gui_strings.h:217 +#: data/po/gui_strings.h:419 data/po/gui_strings.h:587 +#: data/po/gui_strings.h:613 data/po/gui_strings.h:647 msgid "Continue" msgstr "" @@ -750,8 +756,8 @@ #: src/states_screens/options_screen_audio.cpp:66 #: src/states_screens/options_screen_video.cpp:90 #: src/states_screens/options_screen_ui.cpp:114 -#: src/states_screens/options_screen_players.cpp:73 data/po/gui_strings.h:433 -#: data/po/gui_strings.h:576 +#: src/states_screens/options_screen_players.cpp:73 data/po/gui_strings.h:430 +#: data/po/gui_strings.h:573 msgid "Controls" msgstr "" @@ -761,30 +767,30 @@ #. I18N: ./data/gui/story_mode_lobby.stkgui #. I18N: In story mode 'select a game slot' menu -#: data/po/gui_strings.h:264 +#: data/po/gui_strings.h:261 msgid "Create a new player" msgstr "" #. I18N: ./data/gui/credits.stkgui #. I18N: Title in credits screen -#: data/po/gui_strings.h:495 +#: data/po/gui_strings.h:492 msgid "Credits" msgstr "" #. I18N: custom video settings -#: src/states_screens/options_screen_video.cpp:332 +#: src/states_screens/options_screen_video.cpp:330 msgid "Custom" msgstr "" #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:380 +#: data/po/gui_strings.h:377 msgid "Custom settings..." msgstr "" #. I18N: ./data/gui/options_device.stkgui #. I18N: To delete a keyboard configuration -#: src/states_screens/options_screen_input2.cpp:96 data/po/gui_strings.h:437 +#: src/states_screens/options_screen_input2.cpp:96 data/po/gui_strings.h:434 msgid "Delete Configuration" msgstr "" @@ -796,7 +802,7 @@ #. I18N: in the graphical options tooltip; #. indicates a graphical feature is disabled -#: src/states_screens/options_screen_video.cpp:352 +#: src/states_screens/options_screen_video.cpp:351 #: src/states_screens/dialogs/custom_video_settings.cpp:56 #: src/states_screens/dialogs/custom_video_settings.cpp:80 msgid "Disabled" @@ -804,11 +810,11 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:669 +#: data/po/gui_strings.h:662 msgid "Display FPS" msgstr "" -#: src/states_screens/race_result_gui.cpp:230 +#: src/states_screens/race_result_gui.cpp:231 msgid "Do you really want to abort the Grand Prix?" msgstr "" @@ -831,6 +837,10 @@ msgid "Down" msgstr "" +#: src/states_screens/race_result_gui.cpp:817 +msgid "Draw" +msgstr "" + #. I18N: Game mode #: src/race/race_manager.hpp:183 msgid "Easter Egg Hunt" @@ -842,17 +852,17 @@ msgstr "" #. I18N: ./data/karts/elephpant/kart.xml -#: data/po/gui_strings.h:860 +#: data/po/gui_strings.h:859 msgid "Elephpant" msgstr "" -#: src/states_screens/race_result_gui.cpp:345 -#: src/states_screens/race_result_gui.cpp:702 +#: src/states_screens/race_result_gui.cpp:354 +#: src/states_screens/race_result_gui.cpp:711 msgid "Eliminated" msgstr "" #. I18N: ./data/karts/emule/kart.xml -#: data/po/gui_strings.h:851 +#: data/po/gui_strings.h:847 msgid "Emule" msgstr "" @@ -866,8 +876,8 @@ #. indicates a graphical feature is enabled #. I18N: ./data/gui/options_audio.stkgui #. I18N: Next to checkbox in settings menu -#: src/states_screens/options_screen_video.cpp:349 data/po/gui_strings.h:349 -#: data/po/gui_strings.h:361 +#: src/states_screens/options_screen_video.cpp:348 data/po/gui_strings.h:346 +#: data/po/gui_strings.h:358 msgid "Enabled" msgstr "" @@ -878,7 +888,7 @@ #. I18N: ./data/gui/enter_player_name_dialog.stkgui #. I18N: In the 'add new player' dialog -#: data/po/gui_strings.h:565 +#: data/po/gui_strings.h:562 msgid "Enter the new player's name" msgstr "" @@ -890,7 +900,7 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:651 +#: data/po/gui_strings.h:644 msgid "Exit Race" msgstr "" @@ -900,14 +910,14 @@ #. I18N: Difficulty #. I18N: ./data/gui/story_mode_new.stkgui #. I18N: Difficulty -#: data/po/gui_strings.h:208 data/po/gui_strings.h:283 -#: data/po/gui_strings.h:555 +#: data/po/gui_strings.h:205 data/po/gui_strings.h:280 +#: data/po/gui_strings.h:552 msgid "Expert" msgstr "" #. I18N: shown when a player is hit by a rubber ball. %1 is the #. attacker, %0 is the victim. -#: src/items/rubber_ball.cpp:310 +#: src/items/rubber_ball.cpp:313 msgid "Fetch the ball, %0!" msgstr "" @@ -915,7 +925,7 @@ msgid "Final lap!" msgstr "" -#: src/states_screens/race_setup_screen.cpp:296 +#: src/states_screens/race_setup_screen.cpp:308 msgid "Find all Easter Eggs" msgstr "" @@ -926,7 +936,7 @@ #. I18N: ./data/gui/help4.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:319 +#: data/po/gui_strings.h:316 msgid "" "First, you will need several input devices (having multiple gamepads or " "joysticks is the best way to play with several people). Go in the input " @@ -943,7 +953,7 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:475 +#: data/po/gui_strings.h:472 msgid "" "Follow the leader: run for second place, as the last kart will be " "disqualified every time the counter hits zero. Beware : going in front of " @@ -951,7 +961,7 @@ msgstr "" #. I18N: ./data/tracks/fortmagma/track.xml -#: data/po/gui_strings.h:65 +#: data/po/gui_strings.h:62 msgid "Fort Magma" msgstr "" @@ -962,10 +972,15 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:396 +#: data/po/gui_strings.h:393 msgid "Fullscreen" msgstr "" +#. I18N: soccer mode +#: src/modes/soccer_world.cpp:125 +msgid "GOAL!" +msgstr "" + #. I18N: Key binding section #: src/states_screens/options_screen_input2.cpp:129 msgid "Game Keys" @@ -979,8 +994,8 @@ #. I18N: Tab in help menu #. I18N: ./data/gui/help1.stkgui #. I18N: Tab in help menu -#: data/po/gui_strings.h:154 data/po/gui_strings.h:305 -#: data/po/gui_strings.h:456 data/po/gui_strings.h:747 +#: data/po/gui_strings.h:151 data/po/gui_strings.h:302 +#: data/po/gui_strings.h:453 data/po/gui_strings.h:740 msgid "Game Modes" msgstr "" @@ -1004,8 +1019,8 @@ #. I18N: Tab in help menu #. I18N: ./data/gui/help1.stkgui #. I18N: Tab in help menu -#: data/po/gui_strings.h:146 data/po/gui_strings.h:297 -#: data/po/gui_strings.h:448 data/po/gui_strings.h:739 +#: data/po/gui_strings.h:143 data/po/gui_strings.h:294 +#: data/po/gui_strings.h:445 data/po/gui_strings.h:732 msgid "General" msgstr "" @@ -1015,12 +1030,12 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:639 +#: data/po/gui_strings.h:632 msgid "Give Up Race" msgstr "" #. I18N: ./data/karts/gnu/kart.xml -#: data/po/gui_strings.h:839 +#: data/po/gui_strings.h:835 msgid "Gnu" msgstr "" @@ -1031,18 +1046,18 @@ #. I18N: ./data/gui/tracks.stkgui #. I18N: Section in track selection screen -#: src/states_screens/dialogs/select_challenge.cpp:139 -#: data/po/gui_strings.h:728 +#: src/states_screens/dialogs/select_challenge.cpp:140 +#: data/po/gui_strings.h:721 msgid "Grand Prix" msgstr "" -#: src/states_screens/race_result_gui.cpp:915 +#: src/states_screens/race_result_gui.cpp:975 msgid "Grand Prix progress:" msgstr "" #. I18N: ./data/gui/options_video.stkgui #. I18N: In the graphics settings -#: data/po/gui_strings.h:376 +#: data/po/gui_strings.h:373 msgid "Graphical Effects Level" msgstr "" @@ -1052,17 +1067,17 @@ #: src/states_screens/options_screen_audio.cpp:63 #: src/states_screens/options_screen_input2.cpp:70 #: src/states_screens/options_screen_ui.cpp:111 -#: src/states_screens/options_screen_players.cpp:70 data/po/gui_strings.h:372 +#: src/states_screens/options_screen_players.cpp:70 data/po/gui_strings.h:369 msgid "Graphics" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui -#: data/po/gui_strings.h:223 +#: data/po/gui_strings.h:220 msgid "Graphics Settings" msgstr "" #. I18N: ./data/tracks/greenvalley/track.xml -#: data/po/gui_strings.h:71 +#: data/po/gui_strings.h:68 msgid "Green Valley" msgstr "" @@ -1071,7 +1086,7 @@ msgstr "" #. I18N: ./data/tracks/hacienda/track.xml -#: data/po/gui_strings.h:32 +#: data/po/gui_strings.h:29 msgid "Hacienda" msgstr "" @@ -1081,21 +1096,21 @@ #. I18N: Race paused button #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:532 data/po/gui_strings.h:647 -#: data/po/gui_strings.h:701 +#: data/po/gui_strings.h:529 data/po/gui_strings.h:640 +#: data/po/gui_strings.h:694 msgid "Help" msgstr "" #. I18N: ./data/karts/hexley/kart.xml -#: data/po/gui_strings.h:824 +#: data/po/gui_strings.h:820 msgid "Hexley" msgstr "" -#: src/states_screens/race_result_gui.cpp:948 +#: src/states_screens/race_result_gui.cpp:1008 msgid "Highscores" msgstr "" -#: src/states_screens/race_setup_screen.cpp:277 +#: src/states_screens/race_setup_screen.cpp:288 msgid "" "Hit others with weapons until they lose all their lives. (Only in " "multiplayer games)" @@ -1108,26 +1123,26 @@ #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:95 data/po/gui_strings.h:98 +#: data/po/gui_strings.h:92 data/po/gui_strings.h:95 msgid "If you can beat me at racing, I will free the old codger." msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:770 +#: data/po/gui_strings.h:763 msgid "" "If you see a button with a lock like this one, you need to complete a " "challenge to unlock it." msgstr "" -#: src/input/input_manager.cpp:654 +#: src/input/input_manager.cpp:656 #, c-format msgid "Ignoring '%s', you needed to join earlier to play!" msgstr "" #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-on screen action -#: data/po/gui_strings.h:782 +#: data/po/gui_strings.h:775 msgid "Install" msgstr "" @@ -1137,31 +1152,25 @@ #. I18N: Difficulty #. I18N: ./data/gui/story_mode_new.stkgui #. I18N: Difficulty -#: data/po/gui_strings.h:204 data/po/gui_strings.h:279 -#: data/po/gui_strings.h:551 +#: data/po/gui_strings.h:201 data/po/gui_strings.h:276 +#: data/po/gui_strings.h:548 msgid "Intermediate" msgstr "" -#. I18N: ./data/gui/racesetup.stkgui -#. I18N: Difficulty -#: data/po/gui_strings.h:287 -msgid "Iron man" -msgstr "" - #. I18N: ./data/gui/addons_screen.stkgui #. I18N: Section in the addons menu -#: data/po/gui_strings.h:609 +#: data/po/gui_strings.h:602 msgid "Karts" msgstr "" #. I18N: ./data/gui/confirm_resolution_dialog.stkgui #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton -#: data/po/gui_strings.h:487 +#: data/po/gui_strings.h:484 msgid "Keep this resolution" msgstr "" #. I18N: short definition for follow-the-leader game mode -#: src/states_screens/race_setup_screen.cpp:268 +#: src/states_screens/race_setup_screen.cpp:279 msgid "Keep up with the leader kart but don't overtake it!" msgstr "" @@ -1171,14 +1180,13 @@ msgstr "" #. I18N: ./data/karts/konqi/kart.xml -#: data/po/gui_strings.h:842 +#: data/po/gui_strings.h:838 msgid "Konqi" msgstr "" #. I18N: Shown at the end of a race #: src/states_screens/race_gui_overworld.cpp:106 -#: src/states_screens/race_gui.cpp:93 -#: src/states_screens/minimal_race_gui.cpp:103 +#: src/states_screens/race_gui.cpp:103 msgid "Lap" msgstr "" @@ -1202,7 +1210,7 @@ msgid "Left" msgstr "" -#: src/guiengine/engine.cpp:1266 +#: src/guiengine/engine.cpp:1273 msgid "Loading" msgstr "" @@ -1217,7 +1225,7 @@ #: src/states_screens/kart_selection.cpp:2086 #: src/states_screens/arenas_screen.cpp:239 #: src/states_screens/arenas_screen.cpp:269 -#: src/states_screens/race_setup_screen.cpp:260 +#: src/states_screens/race_setup_screen.cpp:271 msgid "Locked : solve active challenges to gain access to more!" msgstr "" @@ -1235,7 +1243,7 @@ msgstr "" #. I18N: if some kart animations are enabled -#: src/states_screens/options_screen_video.cpp:356 +#: src/states_screens/options_screen_video.cpp:355 msgid "Me Only" msgstr "" @@ -1251,7 +1259,7 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:677 +#: data/po/gui_strings.h:670 msgid "Minimal Race GUI" msgstr "" @@ -1269,7 +1277,7 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:689 +#: data/po/gui_strings.h:682 msgid "Multiplayer" msgstr "" @@ -1281,19 +1289,19 @@ #. I18N: Tab in help menu #. I18N: ./data/gui/help1.stkgui #. I18N: Tab in help menu -#: data/po/gui_strings.h:158 data/po/gui_strings.h:309 -#: data/po/gui_strings.h:460 data/po/gui_strings.h:751 +#: data/po/gui_strings.h:155 data/po/gui_strings.h:306 +#: data/po/gui_strings.h:457 data/po/gui_strings.h:744 msgid "Multiplayer" msgstr "" #. I18N: ./data/gui/options_audio.stkgui #. I18N: Section in the audio/video settings submenu -#: data/po/gui_strings.h:345 +#: data/po/gui_strings.h:342 msgid "Music" msgstr "" #. I18N: ./data/gui/story_mode_new.stkgui -#: data/po/gui_strings.h:539 +#: data/po/gui_strings.h:536 msgid "New Game" msgstr "" @@ -1331,17 +1339,17 @@ msgid "Nitro" msgstr "" -#: src/states_screens/dialogs/select_challenge.cpp:141 +#: src/states_screens/dialogs/select_challenge.cpp:142 msgid "Nitro challenge" msgstr "" #. I18N: ./data/karts/nolok/kart.xml -#: data/po/gui_strings.h:830 +#: data/po/gui_strings.h:826 msgid "Nolok" msgstr "" #. I18N: if no kart animations are enabled -#: src/states_screens/options_screen_video.cpp:358 +#: src/states_screens/options_screen_video.cpp:357 msgid "None" msgstr "" @@ -1355,7 +1363,7 @@ msgid "Northern Resort" msgstr "" -#: src/tracks/track_object_presentation.cpp:670 +#: src/tracks/track_object_presentation.cpp:675 msgid "" "Note that if you manage to skid for several seconds, you will receive a " "bonus speedup as a reward!" @@ -1367,25 +1375,25 @@ #. I18N: Difficulty #. I18N: ./data/gui/story_mode_new.stkgui #. I18N: Difficulty -#: data/po/gui_strings.h:200 data/po/gui_strings.h:275 -#: data/po/gui_strings.h:547 +#: data/po/gui_strings.h:197 data/po/gui_strings.h:272 +#: data/po/gui_strings.h:544 msgid "Novice" msgstr "" -#: src/states_screens/dialogs/select_challenge.cpp:64 +#: src/states_screens/dialogs/select_challenge.cpp:65 #, c-format msgid "Number of AI Karts : %i" msgstr "" #. I18N: ./data/gui/racesetup.stkgui #. I18N: In race setup menu -#: data/po/gui_strings.h:271 +#: data/po/gui_strings.h:268 msgid "Number of AI karts" msgstr "" #. I18N: ./data/gui/soccer_setup.stkgui #. I18N: In soccer setup menu -#: data/po/gui_strings.h:411 +#: data/po/gui_strings.h:408 msgid "Number of goals to win" msgstr "" @@ -1394,18 +1402,18 @@ msgstr "" #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix -#: data/po/gui_strings.h:110 data/po/gui_strings.h:812 +#: data/po/gui_strings.h:107 data/po/gui_strings.h:805 msgid "Off the beaten track" msgstr "" #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:83 data/po/gui_strings.h:86 +#: data/po/gui_strings.h:80 data/po/gui_strings.h:83 msgid "Oh yes, see, he's in my castle now and will be served for supper..." msgstr "" #. I18N: ./data/tracks/mines/track.xml -#: data/po/gui_strings.h:35 +#: data/po/gui_strings.h:32 msgid "Old Mine" msgstr "" @@ -1414,11 +1422,11 @@ msgid "Oliver's Math Class" msgstr "" -#: src/input/input_manager.cpp:684 +#: src/input/input_manager.cpp:686 msgid "Only the Game Master may act at this point!" msgstr "" -#: src/tracks/track_object_presentation.cpp:649 +#: src/tracks/track_object_presentation.cpp:654 #, c-format msgid "Oops! When you're in trouble, press <%s> to be rescued" msgstr "" @@ -1429,13 +1437,13 @@ #. I18N: Race paused button #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:528 data/po/gui_strings.h:643 -#: data/po/gui_strings.h:697 +#: data/po/gui_strings.h:525 data/po/gui_strings.h:636 +#: data/po/gui_strings.h:690 msgid "Options" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:177 +#: data/po/gui_strings.h:174 msgid "Parachute - slows down all karts in a better position." msgstr "" @@ -1446,7 +1454,7 @@ #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: ./data/gui/race_paused_dialog.stkgui -#: data/po/gui_strings.h:516 data/po/gui_strings.h:623 +#: data/po/gui_strings.h:513 data/po/gui_strings.h:616 msgid "Paused" msgstr "" @@ -1455,29 +1463,29 @@ msgstr "" #. I18N: ./data/grandprix/1_penguinplayground.grandprix -#: data/po/gui_strings.h:113 data/po/gui_strings.h:815 +#: data/po/gui_strings.h:110 data/po/gui_strings.h:808 msgid "Penguin Playground" msgstr "" #. I18N: ./data/karts/pidgin/kart.xml -#: data/po/gui_strings.h:848 +#: data/po/gui_strings.h:844 msgid "Pidgin" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:251 +#: data/po/gui_strings.h:248 msgid "Pixel Shaders" msgstr "" #. I18N: in graphical options -#: src/states_screens/options_screen_video.cpp:388 +#: src/states_screens/options_screen_video.cpp:387 #, c-format msgid "Pixel shaders : %s" msgstr "" #. I18N: ./data/gui/tutorial.stkgui -#: data/po/gui_strings.h:334 +#: data/po/gui_strings.h:331 msgid "Play all" msgstr "" @@ -1487,7 +1495,7 @@ #: src/states_screens/options_screen_audio.cpp:65 #: src/states_screens/options_screen_input2.cpp:73 #: src/states_screens/options_screen_video.cpp:89 -#: src/states_screens/options_screen_ui.cpp:113 data/po/gui_strings.h:502 +#: src/states_screens/options_screen_ui.cpp:113 data/po/gui_strings.h:499 msgid "Players" msgstr "" @@ -1496,16 +1504,16 @@ msgid "Please re-configure your key bindings." msgstr "" -#: src/states_screens/addons_screen.cpp:416 +#: src/states_screens/addons_screen.cpp:434 msgid "Please wait while addons are updated" msgstr "" -#: src/states_screens/main_menu_screen.cpp:402 +#: src/states_screens/main_menu_screen.cpp:403 msgid "Please wait while the add-ons are loading" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:171 +#: data/po/gui_strings.h:168 msgid "" "Plunger - throw straight to pull an opponent back, or throw while looking " "back to make one lose sight." @@ -1513,12 +1521,12 @@ #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:247 +#: data/po/gui_strings.h:244 msgid "Post-processing (motion blur)" msgstr "" #. I18N: in graphical options -#: src/states_screens/options_screen_video.cpp:391 +#: src/states_screens/options_screen_video.cpp:390 #, c-format msgid "Post-processing (motion blur) : %s" msgstr "" @@ -1527,24 +1535,24 @@ #. I18N: When configuring input #. I18N: ./data/gui/press_a_key_dialog.stkgui #. I18N: When configuring input -#: data/po/gui_strings.h:569 data/po/gui_strings.h:724 +#: data/po/gui_strings.h:566 data/po/gui_strings.h:717 msgid "Press ESC to cancel" msgstr "" #. I18N: ./data/gui/press_a_key_dialog.stkgui -#: data/po/gui_strings.h:716 +#: data/po/gui_strings.h:709 msgid "Press a key" msgstr "" #. I18N: ./data/gui/options_input.stkgui #. I18N: In key bindings configuration menu -#: data/po/gui_strings.h:580 +#: data/po/gui_strings.h:577 msgid "Press enter or double-click on a device to configure it" msgstr "" #. I18N: ./data/gui/options_players.stkgui #. I18N: In players configuration menu -#: data/po/gui_strings.h:509 +#: data/po/gui_strings.h:506 msgid "Press enter or double-click on a player to edit him/her" msgstr "" @@ -1563,7 +1571,8 @@ msgstr "" #. I18N: ./data/karts/sara/kart.xml -#: data/po/gui_strings.h:827 +#. I18N: ./data/karts/sara_dress/kart.xml +#: data/po/gui_strings.h:823 data/po/gui_strings.h:850 msgid "Princess Sara" msgstr "" @@ -1578,11 +1587,11 @@ msgstr "" #. I18N: ./data/karts/puffy/kart.xml -#: data/po/gui_strings.h:836 +#: data/po/gui_strings.h:832 msgid "Puffy" msgstr "" -#: src/states_screens/race_setup_screen.cpp:285 +#: src/states_screens/race_setup_screen.cpp:297 msgid "" "Push the ball to the opposite cage to score goals. (Only in multiplayer " "games)" @@ -1590,15 +1599,15 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:713 +#: data/po/gui_strings.h:706 msgid "Quit" msgstr "" #. I18N: ./data/gui/select_challenge.stkgui #. I18N: ./data/gui/racesetup.stkgui #. I18N: ./data/gui/soccer_setup.stkgui -#: data/po/gui_strings.h:192 data/po/gui_strings.h:267 -#: data/po/gui_strings.h:407 +#: data/po/gui_strings.h:189 data/po/gui_strings.h:264 +#: data/po/gui_strings.h:404 msgid "Race Setup" msgstr "" @@ -1616,14 +1625,13 @@ msgstr "" #: src/states_screens/race_gui_overworld.cpp:107 -#: src/states_screens/race_gui.cpp:94 -#: src/states_screens/minimal_race_gui.cpp:104 +#: src/states_screens/race_gui.cpp:104 msgid "Rank" msgstr "" #. I18N: ./data/gui/addons_screen.stkgui #. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating -#: data/po/gui_strings.h:605 +#: data/po/gui_strings.h:598 msgid "Rating >=" msgstr "" @@ -1632,28 +1640,26 @@ msgid "Ready!" msgstr "" +#: src/states_screens/race_result_gui.cpp:808 +msgid "Red team won" +msgstr "" + #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:467 +#: data/po/gui_strings.h:464 msgid "" "Regular Race: all blows allowed, so catch weapons and make clever use of " "them!" msgstr "" -#. I18N: ./data/gui/addons_screen.stkgui -#. I18N: Reload button to reload addon data -#: data/po/gui_strings.h:597 -msgid "Reload" -msgstr "" - #. I18N: ./data/gui/story_mode_lobby.stkgui -#: data/po/gui_strings.h:260 +#: data/po/gui_strings.h:257 msgid "Remember me" msgstr "" #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:400 +#: data/po/gui_strings.h:397 msgid "Remember window location" msgstr "" @@ -1667,17 +1673,17 @@ msgid "Rename" msgstr "" -#: src/states_screens/dialogs/select_challenge.cpp:60 +#: src/states_screens/dialogs/select_challenge.cpp:61 #, c-format msgid "Required Nitro Points : %i" msgstr "" -#: src/states_screens/dialogs/select_challenge.cpp:49 +#: src/states_screens/dialogs/select_challenge.cpp:50 #, c-format msgid "Required Rank : %i" msgstr "" -#: src/states_screens/dialogs/select_challenge.cpp:54 +#: src/states_screens/dialogs/select_challenge.cpp:55 #, c-format msgid "Required Time : %i" msgstr "" @@ -1689,23 +1695,23 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the graphics settings -#: data/po/gui_strings.h:392 +#: data/po/gui_strings.h:389 msgid "Resolution" msgstr "" -#: src/states_screens/race_result_gui.cpp:128 +#: src/states_screens/race_result_gui.cpp:129 msgid "Restart" msgstr "" #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:635 +#: data/po/gui_strings.h:628 msgid "Restart Race" msgstr "" #. I18N: ./data/gui/track_info_dialog.stkgui #. I18N: Drive the track reverse -#: data/po/gui_strings.h:132 +#: data/po/gui_strings.h:129 msgid "Reverse" msgstr "" @@ -1715,7 +1721,7 @@ msgstr "" #. I18N: ./data/tracks/scotland/track.xml -#: data/po/gui_strings.h:68 +#: data/po/gui_strings.h:65 msgid "Scotland" msgstr "" @@ -1725,24 +1731,24 @@ msgstr "" #. I18N: ./data/gui/story_mode_lobby.stkgui -#: data/po/gui_strings.h:257 +#: data/po/gui_strings.h:254 msgid "Select a Player" msgstr "" #. I18N: ./data/gui/racesetup.stkgui -#: data/po/gui_strings.h:290 +#: data/po/gui_strings.h:287 msgid "Select a game mode" msgstr "" #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:524 +#: data/po/gui_strings.h:521 msgid "Select kart" msgstr "" #. I18N: ./data/gui/story_mode_new.stkgui #. I18N: In the new story mode game dialog -#: data/po/gui_strings.h:543 +#: data/po/gui_strings.h:540 msgid "Select your identity" msgstr "" @@ -1753,12 +1759,12 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: src/states_screens/race_result_gui.cpp:138 data/po/gui_strings.h:631 +#: src/states_screens/race_result_gui.cpp:139 data/po/gui_strings.h:624 msgid "Setup New Race" msgstr "" #. I18N: ./data/tracks/sandtrack/track.xml -#: data/po/gui_strings.h:53 +#: data/po/gui_strings.h:50 msgid "Shifting Sands" msgstr "" @@ -1769,7 +1775,7 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:685 +#: data/po/gui_strings.h:678 msgid "Single-player" msgstr "" @@ -1785,12 +1791,12 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the graphics settings -#: data/po/gui_strings.h:665 +#: data/po/gui_strings.h:658 msgid "Skin" msgstr "" #. I18N: ./data/tracks/snowtuxpeak/track.xml -#: data/po/gui_strings.h:38 +#: data/po/gui_strings.h:35 msgid "Snow Peak" msgstr "" @@ -1800,12 +1806,12 @@ msgstr "" #. I18N: ./data/tracks/soccer_field/track.xml -#: data/po/gui_strings.h:62 +#: data/po/gui_strings.h:59 msgid "Soccer field" msgstr "" -#: src/states_screens/addons_screen.cpp:494 -#: src/states_screens/main_menu_screen.cpp:395 +#: src/states_screens/addons_screen.cpp:512 +#: src/states_screens/main_menu_screen.cpp:396 msgid "" "Sorry, an error occurred while contacting the add-ons website. Make sure you " "are connected to the Internet and that SuperTuxKart is not blocked by a " @@ -1818,23 +1824,23 @@ #. I18N: ./data/gui/options_audio.stkgui #. I18N: Section in audio/video settings submenu -#: data/po/gui_strings.h:357 +#: data/po/gui_strings.h:354 msgid "Sound Effects" msgstr "" #. I18N: ./data/gui/arenas.stkgui #. I18N: track group -#: data/po/gui_strings.h:798 +#: data/po/gui_strings.h:791 msgid "Standard" msgstr "" #. I18N: ./data/tracks/startrack/track.xml -#: data/po/gui_strings.h:50 +#: data/po/gui_strings.h:47 msgid "Star Track" msgstr "" #. I18N: ./data/gui/story_mode_new.stkgui -#: data/po/gui_strings.h:558 +#: data/po/gui_strings.h:555 msgid "Start Game" msgstr "" @@ -1843,7 +1849,7 @@ msgstr "" #. I18N: ./data/gui/track_info_dialog.stkgui -#: data/po/gui_strings.h:139 +#: data/po/gui_strings.h:136 msgid "Start Race" msgstr "" @@ -1859,7 +1865,7 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:681 +#: data/po/gui_strings.h:674 msgid "Story Mode" msgstr "" @@ -1868,8 +1874,14 @@ msgid "Subsea" msgstr "" +#. I18N: ./data/gui/racesetup.stkgui +#. I18N: Difficulty +#: data/po/gui_strings.h:284 +msgid "SuperTux" +msgstr "" + #. I18N: ./data/gui/addons_screen.stkgui -#: data/po/gui_strings.h:593 +#: data/po/gui_strings.h:590 msgid "SuperTuxKart Addons" msgstr "" @@ -1877,8 +1889,8 @@ #. I18N: ./data/gui/help4.stkgui #. I18N: ./data/gui/help3.stkgui #. I18N: ./data/gui/help1.stkgui -#: data/po/gui_strings.h:142 data/po/gui_strings.h:293 -#: data/po/gui_strings.h:444 data/po/gui_strings.h:735 +#: data/po/gui_strings.h:139 data/po/gui_strings.h:290 +#: data/po/gui_strings.h:441 data/po/gui_strings.h:728 msgid "SuperTuxKart Help" msgstr "" @@ -1888,23 +1900,23 @@ #. I18N: ./data/gui/options_players.stkgui #. I18N: ./data/gui/options_input.stkgui #. I18N: ./data/gui/options_ui.stkgui -#: data/po/gui_strings.h:337 data/po/gui_strings.h:368 -#: data/po/gui_strings.h:429 data/po/gui_strings.h:498 -#: data/po/gui_strings.h:572 data/po/gui_strings.h:657 +#: data/po/gui_strings.h:334 data/po/gui_strings.h:365 +#: data/po/gui_strings.h:426 data/po/gui_strings.h:495 +#: data/po/gui_strings.h:569 data/po/gui_strings.h:650 msgid "SuperTuxKart Options" msgstr "" #. I18N: ./data/gui/help4.stkgui -#: data/po/gui_strings.h:312 +#: data/po/gui_strings.h:309 msgid "SuperTuxKart can be played in multiplayer mode on the same computer" msgstr "" #. I18N: ./data/gui/help3.stkgui -#: data/po/gui_strings.h:463 +#: data/po/gui_strings.h:460 msgid "SuperTuxKart features several game modes" msgstr "" -#: src/main.cpp:1420 +#: src/main.cpp:1426 msgid "" "SuperTuxKart may connect to a server to download add-ons and notify you of " "updates. Would you like this feature to be enabled? (To change this setting " @@ -1913,19 +1925,19 @@ msgstr "" #. I18N: ./data/karts/suzanne/kart.xml -#: data/po/gui_strings.h:863 +#: data/po/gui_strings.h:862 msgid "Suzanne" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:183 +#: data/po/gui_strings.h:180 msgid "" "Swapper - gift boxes are transformed into bananas and vice versa for a short " "time." msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:189 +#: data/po/gui_strings.h:186 msgid "Swatter - will squash karts close by, slowing them down." msgstr "" @@ -1936,18 +1948,18 @@ #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:239 +#: data/po/gui_strings.h:236 msgid "Texture filtering" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: in the help menu -#: data/po/gui_strings.h:774 +#: data/po/gui_strings.h:767 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost." msgstr "" #. I18N: ./data/tracks/islandtrack/track.xml -#: data/po/gui_strings.h:41 +#: data/po/gui_strings.h:38 msgid "The Island" msgstr "" @@ -1956,11 +1968,11 @@ msgstr "" #. I18N: ./data/tracks/stadium/track.xml -#: data/po/gui_strings.h:56 +#: data/po/gui_strings.h:53 msgid "The Stadium" msgstr "" -#: src/states_screens/main_menu_screen.cpp:390 +#: src/states_screens/main_menu_screen.cpp:391 msgid "The add-ons module is currently disabled in the Options screen" msgstr "" @@ -1981,7 +1993,7 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:471 +#: data/po/gui_strings.h:468 msgid "Time Trial: Contains no powerups, so only your driving skills matter!" msgstr "" @@ -1999,17 +2011,17 @@ #. I18N: ./data/gui/help2.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:162 +#: data/po/gui_strings.h:159 msgid "To help you win, there are some powerups you can collect :" msgstr "" #. I18N: ./data/grandprix/3_tothemoonandback.grandprix -#: data/po/gui_strings.h:116 data/po/gui_strings.h:818 +#: data/po/gui_strings.h:113 data/po/gui_strings.h:811 msgid "To the moon and back" msgstr "" #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it -#: src/states_screens/race_gui_base.cpp:95 +#: src/states_screens/race_gui_base.cpp:97 #, c-format msgid "Top %i" msgstr "" @@ -2022,7 +2034,7 @@ #. I18N: ./data/gui/addons_screen.stkgui #. I18N: Section in the addons menu -#: data/po/gui_strings.h:613 +#: data/po/gui_strings.h:606 msgid "Tracks" msgstr "" @@ -2033,30 +2045,30 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: src/states_screens/race_gui_overworld.cpp:448 data/po/gui_strings.h:705 +#: src/states_screens/race_gui_overworld.cpp:448 data/po/gui_strings.h:698 msgid "Tutorial" msgstr "" #. I18N: ./data/gui/tutorial.stkgui #. I18N: Title for tutorials screen -#: data/po/gui_strings.h:331 +#: data/po/gui_strings.h:328 msgid "Tutorial : Selection Room" msgstr "" #. I18N: ./data/karts/tux/kart.xml -#: data/po/gui_strings.h:857 +#: data/po/gui_strings.h:856 msgid "Tux" msgstr "" #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Type of race, in a challenge -#: data/po/gui_strings.h:196 +#: data/po/gui_strings.h:193 msgid "Type :" msgstr "" #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-on screen action -#: data/po/gui_strings.h:786 +#: data/po/gui_strings.h:779 msgid "Uninstall" msgstr "" @@ -2071,7 +2083,7 @@ #. I18N: ./data/gui/addons_screen.stkgui #. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items -#: data/po/gui_strings.h:601 +#: data/po/gui_strings.h:594 msgid "Updated" msgstr "" @@ -2081,17 +2093,17 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:388 +#: data/po/gui_strings.h:385 msgid "Use Frame Buffer Objects (requires restart)" msgstr "" #. I18N: ./data/gui/soccer_setup.stkgui #. I18N: In soccer setup menu -#: data/po/gui_strings.h:415 +#: data/po/gui_strings.h:412 msgid "Use left/right to choose your team" msgstr "" -#: src/tracks/track_object_presentation.cpp:639 +#: src/tracks/track_object_presentation.cpp:644 #, c-format msgid "Use the nitro you collected by pressing <%s>!" msgstr "" @@ -2102,12 +2114,12 @@ #: src/states_screens/options_screen_audio.cpp:64 #: src/states_screens/options_screen_input2.cpp:72 #: src/states_screens/options_screen_video.cpp:88 -#: src/states_screens/options_screen_players.cpp:72 data/po/gui_strings.h:661 +#: src/states_screens/options_screen_players.cpp:72 data/po/gui_strings.h:654 msgid "User Interface" msgstr "" #. I18N: ./data/gui/soccer_setup.stkgui -#: data/po/gui_strings.h:418 +#: data/po/gui_strings.h:415 msgid "VS" msgstr "" @@ -2118,7 +2130,7 @@ #. I18N: ./data/gui/options_video.stk... [truncated message content] |
From: <ma...@us...> - 2013-09-22 18:42:37
|
Revision: 14131 http://sourceforge.net/p/supertuxkart/code/14131 Author: magned Date: 2013-09-22 18:42:34 +0000 (Sun, 22 Sep 2013) Log Message: ----------- New screenshot for Old Mine. Modified Paths: -------------- main/trunk/data/karts/xfcemouse/kart.xml main/trunk/data/tracks/lighthouse/track.xml main/trunk/data/tracks/mines/sshot-mines.jpg Modified: main/trunk/data/karts/xfcemouse/kart.xml =================================================================== --- main/trunk/data/karts/xfcemouse/kart.xml 2013-09-22 16:27:56 UTC (rev 14130) +++ main/trunk/data/karts/xfcemouse/kart.xml 2013-09-22 18:42:34 UTC (rev 14131) @@ -1,7 +1,16 @@ <?xml version="1.0"?> -<kart name="Xfce mouse" version="2" model-file="xfce mouse.b3d" icon-file="xfce_icon64.png" minimap-icon-file="xfce_icon32.png" shadow-file="shadow.png" random-wheel-rot="true" center-shift="0.30" groups="Add-Ons" rgb="0.03 0.40 1.00" revision="2"> - <sounds engine="large"/> - <animations left="19" straight="39" right="59" start-winning="79" start-winning-loop="159" end-winning="189" start-losing="219" start-losing-loop="259" end-losing="289"/> - <wheels/> - <hat offset = "0.0 0.05 0.07"/> +<kart name="Xfce mouse" + version="2" + model-file="xfce mouse.b3d" + icon-file="xfce_icon64.png" + minimap-icon-file="xfce_icon32.png" + shadow-file="shadow.png" + random-wheel-rot="false" + center-shift="0.30" + groups="standard" + rgb="0.03 0.40 1.00" + revision="2"> + <sounds engine="large"/> + <animations left="19" straight="39" right="59" start-winning="79" start-winning-loop="159" end-winning="189" start-losing="219" start-losing-loop="259" end-losing="289"/> + <hat offset = "0.0 0.05 0.07"/> </kart> Modified: main/trunk/data/tracks/lighthouse/track.xml =================================================================== --- main/trunk/data/tracks/lighthouse/track.xml 2013-09-22 16:27:56 UTC (rev 14130) +++ main/trunk/data/tracks/lighthouse/track.xml 2013-09-22 18:42:34 UTC (rev 14131) @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- Generated with script from SVN rev 12720 --> -<track name = "Around the lighthouse" +<track name = "Around The Lighthouse" version = "5" groups = "standard" designer = "jean-manuel clemençon" Modified: main/trunk/data/tracks/mines/sshot-mines.jpg =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2013-10-09 17:42:56
|
Revision: 14224 http://sourceforge.net/p/supertuxkart/code/14224 Author: deveee Date: 2013-10-09 17:42:53 +0000 (Wed, 09 Oct 2013) Log Message: ----------- Fixed waterfall in Sandtrack. Probably regression since r12941. I also added few more emitters in the waterfall. Now it looks little better. Revision Links: -------------- http://sourceforge.net/p/supertuxkart/code/12941 Modified Paths: -------------- main/trunk/data/textures/materials.xml main/trunk/data/tracks/sandtrack/sandtrack_track.b3d main/trunk/data/tracks/sandtrack/scene.xml Modified: main/trunk/data/textures/materials.xml =================================================================== --- main/trunk/data/textures/materials.xml 2013-10-09 07:26:55 UTC (rev 14223) +++ main/trunk/data/textures/materials.xml 2013-10-09 17:42:53 UTC (rev 14224) @@ -15,7 +15,7 @@ <material name="skid-particle1.png" additive="Y" light="N" ignore="Y"/> <material name="skid-particle2.png" additive="Y" light="N" ignore="Y"/> <material name="zipper-particle.png" additive="Y" light="N" ignore="Y"/> - <material name="zipper-particle.png" additive="Y" light="N" ignore="Y"/> + <material name="waterparticles.png" compositing="blend" light="N" ignore="Y"/> <!-- Textures --> <material name="bumpy_surface.png"> Modified: main/trunk/data/tracks/sandtrack/sandtrack_track.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/sandtrack/scene.xml =================================================================== --- main/trunk/data/tracks/sandtrack/scene.xml 2013-10-09 07:26:55 UTC (rev 14223) +++ main/trunk/data/tracks/sandtrack/scene.xml 2013-10-09 17:42:53 UTC (rev 14224) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 13227 --> +<!-- Generated with script from SVN rev Unknown --> <scene> <track model="sandtrack_track.b3d" x="0" y="0" z="0"> <animated-texture name="water_light.png" dx="0.050" /> @@ -8,9 +8,9 @@ <animated-texture name="water_light.png" dx="0.075" /> <animated-texture name="water_light.png" dx="0.020" /> </track> - <object type="animation" model="palm1.b3d" xyz="-71.37 -126.12 -78.55" hpr="0.0 5.6 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-71.37 -126.12 -78.55" hpr="0.0 5.6 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="palm1.b3d"> </object> - <object type="animation" model="palm2.b3d" xyz="-79.02 -127.77 -66.33" hpr="0.0 72.6 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-79.02 -127.77 -66.33" hpr="0.0 72.6 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="palm2.b3d"> </object> <sky-box texture="skybox3.jpg skybox3.jpg skybox2.jpg skybox2.jpg skybox2.jpg skybox2.jpg"/> <camera far="1000.0"/> @@ -19,8 +19,22 @@ <check-line kind="activate" other-ids="0" p1="3.66 150.51" p2="-32.56 137.05" min-height="-141.73" same-group="1"/> </checks> - <particle-emitter kind="waterfall.xml" xyz="-192.84 -166.25 4.00" h="0.00"> + <particle-emitter kind="waterfall.xml" xyz="-190.61 -168.96 -0.16" h="-2.09"> </particle-emitter> + <particle-emitter kind="waterfall.xml" xyz="-192.15 -169.23 2.37" h="-2.09"> + </particle-emitter> + <particle-emitter kind="waterfall.xml" xyz="-193.62 -169.50 4.78" h="-2.09"> + </particle-emitter> + <particle-emitter kind="waterfall.xml" xyz="-195.11 -169.77 7.23" h="-2.09"> + </particle-emitter> + <particle-emitter kind="waterfall.xml" xyz="-189.21 -168.70 -2.48" h="-2.09"> + </particle-emitter> + <particle-emitter kind="waterfall.xml" xyz="-196.57 -170.03 9.63" h="-2.09"> + </particle-emitter> + <particle-emitter kind="waterfall.xml" xyz="-198.21 -170.33 12.33" h="-2.09"> + </particle-emitter> + <particle-emitter kind="waterfall.xml" xyz="-188.23 -168.53 -4.07" h="-2.09"> + </particle-emitter> <item x="-1.63" y="-132.90" z="15.81" /> <item x="0.87" y="-132.90" z="15.81" /> <item x="4.00" y="-132.90" z="15.81" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-10-09 23:46:48
|
Revision: 14228 http://sourceforge.net/p/supertuxkart/code/14228 Author: auria Date: 2013-10-09 23:46:45 +0000 (Wed, 09 Oct 2013) Log Message: ----------- Add betharatux1's new icon Modified Paths: -------------- main/trunk/data/CREDITS main/trunk/data/karts/License.txt main/trunk/data/karts/sara/icon-sara.png Modified: main/trunk/data/CREDITS =================================================================== --- main/trunk/data/CREDITS 2013-10-09 18:05:48 UTC (rev 14227) +++ main/trunk/data/CREDITS 2013-10-09 23:46:45 UTC (rev 14228) @@ -98,6 +98,8 @@ ++ Modified: main/trunk/data/karts/License.txt =================================================================== --- main/trunk/data/karts/License.txt 2013-10-09 18:05:48 UTC (rev 14227) +++ main/trunk/data/karts/License.txt 2013-10-09 23:46:45 UTC (rev 14228) @@ -65,3 +65,8 @@ by Anthony Carré (yekcim), released under GPL 2 except Beagle icon, by Dakal, released under CC-BY-SA 3.0 and Beastie icon, by Lionel Fuentes, released under FreeBSD license (see beastie/License.txt) + Sara icon, by betharatux1 + +Sara: + model by samuncle, released under CC-BY-SA 3.0 + icon by betharatux1 \ No newline at end of file Modified: main/trunk/data/karts/sara/icon-sara.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-10-14 22:43:03
|
Revision: 14258 http://sourceforge.net/p/supertuxkart/code/14258 Author: auria Date: 2013-10-14 22:43:00 +0000 (Mon, 14 Oct 2013) Log Message: ----------- New beastie kart Modified Paths: -------------- main/trunk/data/CREDITS main/trunk/data/karts/beastie/License.txt main/trunk/data/karts/beastie/beastie-shadow.png main/trunk/data/karts/beastie/beastie.b3dz main/trunk/data/karts/beastie/kart.png main/trunk/data/karts/beastie/kart.xml main/trunk/data/karts/beastie/materials.xml Added Paths: ----------- main/trunk/data/karts/beastie/beastie_texture.png Removed Paths: ------------- main/trunk/data/karts/beastie/beastie.png Modified: main/trunk/data/CREDITS =================================================================== --- main/trunk/data/CREDITS 2013-10-14 21:22:09 UTC (rev 14257) +++ main/trunk/data/CREDITS 2013-10-14 22:43:00 UTC (rev 14258) @@ -130,7 +130,7 @@ -+ Modified: main/trunk/data/karts/beastie/License.txt =================================================================== --- main/trunk/data/karts/beastie/License.txt 2013-10-14 21:22:09 UTC (rev 14257) +++ main/trunk/data/karts/beastie/License.txt 2013-10-14 22:43:00 UTC (rev 14258) @@ -1,6 +1,7 @@ -Icon, model and textures : +Beastie Model : Micket, released under CC0 (public license) -Copyright 2011 Lionel Fuentes. All rights reserved. +Kart model and textures : + Copyright 2011 Lionel Fuentes. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Modified: main/trunk/data/karts/beastie/beastie-shadow.png =================================================================== (Binary files differ) Modified: main/trunk/data/karts/beastie/beastie.b3dz =================================================================== (Binary files differ) Deleted: main/trunk/data/karts/beastie/beastie.png =================================================================== (Binary files differ) Added: main/trunk/data/karts/beastie/beastie_texture.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/beastie/beastie_texture.png =================================================================== --- main/trunk/data/karts/beastie/beastie_texture.png 2013-10-14 21:22:09 UTC (rev 14257) +++ main/trunk/data/karts/beastie/beastie_texture.png 2013-10-14 22:43:00 UTC (rev 14258) Property changes on: main/trunk/data/karts/beastie/beastie_texture.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: main/trunk/data/karts/beastie/kart.png =================================================================== (Binary files differ) Modified: main/trunk/data/karts/beastie/kart.xml =================================================================== --- main/trunk/data/karts/beastie/kart.xml 2013-10-14 21:22:09 UTC (rev 14257) +++ main/trunk/data/karts/beastie/kart.xml 2013-10-14 22:43:00 UTC (rev 14258) @@ -1,12 +1,12 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 12507 --> +<!-- Generated with script from SVN rev 12961 --> <kart name = "Beastie" version = "2" model-file = "beastie.b3dz" icon-file = "beastie-icon.png" minimap-icon-file = "beastie-icon.png" shadow-file = "beastie-shadow.png" - random-wheel-rot = "false" + random-wheel-rot = "true" groups = "standard" rgb = "0.77 0.00 0.00" > <sounds engine = "large"/> @@ -33,5 +33,4 @@ <nitro-emitter-a position = "0.387257 0.615989 -0.635706" /> <nitro-emitter-b position = "-0.382115 0.615989 -0.635706" /> </nitro-emitter> - <hat offset = "0.0 0.25 0.02"/> </kart> Modified: main/trunk/data/karts/beastie/materials.xml =================================================================== --- main/trunk/data/karts/beastie/materials.xml 2013-10-14 21:22:09 UTC (rev 14257) +++ main/trunk/data/karts/beastie/materials.xml 2013-10-14 22:43:00 UTC (rev 14258) @@ -1,4 +1,4 @@ -<?xml version="1.0"?> -<!-- Generated with script from SVN rev Unknown --> -<materials> -</materials> +<?xml version="1.0"?> +<!-- Generated with script from SVN rev Unknown --> +<materials> +</materials> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-10-14 23:10:02
|
Revision: 14260 http://sourceforge.net/p/supertuxkart/code/14260 Author: auria Date: 2013-10-14 23:09:57 +0000 (Mon, 14 Oct 2013) Log Message: ----------- Replace star track with spaceship track Modified Paths: -------------- main/trunk/data/CREDITS Added Paths: ----------- main/trunk/data/tracks/startrack/Box.b3d main/trunk/data/tracks/startrack/License.txt main/trunk/data/tracks/startrack/Window.png main/trunk/data/tracks/startrack/ab_crate_a.png main/trunk/data/tracks/startrack/arc1.png main/trunk/data/tracks/startrack/arc2.png main/trunk/data/tracks/startrack/babel-trim11c.jpg main/trunk/data/tracks/startrack/base1c.jpg main/trunk/data/tracks/startrack/basictrim1a.jpg main/trunk/data/tracks/startrack/bild.png main/trunk/data/tracks/startrack/bomber_metal1b.jpg main/trunk/data/tracks/startrack/brushedbarrel.jpg main/trunk/data/tracks/startrack/bzzt2.ogg main/trunk/data/tracks/startrack/ceil1_inner.png main/trunk/data/tracks/startrack/ceil1_outer.png main/trunk/data/tracks/startrack/comp1a.jpg main/trunk/data/tracks/startrack/concrete_plain.png main/trunk/data/tracks/startrack/concrete_plain_dark.png main/trunk/data/tracks/startrack/cromwatertower2.jpg main/trunk/data/tracks/startrack/graph.xml main/trunk/data/tracks/startrack/grate1a.jpg main/trunk/data/tracks/startrack/img_0572.jpg main/trunk/data/tracks/startrack/lightHaloB.png main/trunk/data/tracks/startrack/lightHaloY.png main/trunk/data/tracks/startrack/lightmap_core.png main/trunk/data/tracks/startrack/lightmap_no_room.png main/trunk/data/tracks/startrack/lightmap_no_room_edges.png main/trunk/data/tracks/startrack/lightmap_other1.png main/trunk/data/tracks/startrack/lightmap_other2.png main/trunk/data/tracks/startrack/lightmap_other3.png main/trunk/data/tracks/startrack/lightmap_other4.png main/trunk/data/tracks/startrack/lightmap_other5.png main/trunk/data/tracks/startrack/lightmap_room_1.png main/trunk/data/tracks/startrack/lightmap_room_2a.png main/trunk/data/tracks/startrack/lightmap_room_2b.png main/trunk/data/tracks/startrack/lightmap_room_2c.png main/trunk/data/tracks/startrack/lightmap_room_2d.png main/trunk/data/tracks/startrack/lightmap_room_3a.png main/trunk/data/tracks/startrack/lightmap_room_3b.png main/trunk/data/tracks/startrack/lightmap_room_3c.png main/trunk/data/tracks/startrack/lightmap_room_4.png main/trunk/data/tracks/startrack/lightmap_room_5a.png main/trunk/data/tracks/startrack/lightmap_room_5b.png main/trunk/data/tracks/startrack/lightmap_room_5c.png main/trunk/data/tracks/startrack/lightmap_space.png main/trunk/data/tracks/startrack/lightmap_start.png main/trunk/data/tracks/startrack/marsrobot5.jpg main/trunk/data/tracks/startrack/materials.xml main/trunk/data/tracks/startrack/metal_plates.png main/trunk/data/tracks/startrack/metal_rusted.jpg main/trunk/data/tracks/startrack/metaloverlap.png main/trunk/data/tracks/startrack/modern_mine_beam.png main/trunk/data/tracks/startrack/pipe1a-core.png main/trunk/data/tracks/startrack/pipe1a.jpg main/trunk/data/tracks/startrack/pipe1c.jpg main/trunk/data/tracks/startrack/pipez1a.jpg main/trunk/data/tracks/startrack/quads.xml main/trunk/data/tracks/startrack/reset.png main/trunk/data/tracks/startrack/ribs1a.jpg main/trunk/data/tracks/startrack/rotating.b3d main/trunk/data/tracks/startrack/scene.xml main/trunk/data/tracks/startrack/spaceship_track.b3d main/trunk/data/tracks/startrack/stone.jpg main/trunk/data/tracks/startrack/supp1k.png main/trunk/data/tracks/startrack/thing.png main/trunk/data/tracks/startrack/tile3b.jpg main/trunk/data/tracks/startrack/track.xml main/trunk/data/tracks/startrack/trak2_holes1a.png main/trunk/data/tracks/startrack/trak3_base1-2.png main/trunk/data/tracks/startrack/trak3_base1.png main/trunk/data/tracks/startrack/trak3_corrug1a.png main/trunk/data/tracks/startrack/trak3_light1a.png main/trunk/data/tracks/startrack/trak3_light1b.png main/trunk/data/tracks/startrack/trak3_panel3d.png main/trunk/data/tracks/startrack/trak3_plate1.png main/trunk/data/tracks/startrack/trak3_screen.png main/trunk/data/tracks/startrack/trim1a.jpg main/trunk/data/tracks/startrack/trim4b.jpg main/trunk/data/tracks/startrack/trim6e.jpg main/trunk/data/tracks/startrack/trim8b.jpg main/trunk/data/tracks/startrack/vertpanel1b.jpg main/trunk/data/tracks/startrack/vertpanel2b.jpg main/trunk/data/tracks/startrack/wall1b.jpg main/trunk/data/tracks/startrack/wall3b.jpg main/trunk/data/tracks/startrack/xeon.music main/trunk/data/tracks/startrack/xeon6.ogg Removed Paths: ------------- main/trunk/data/tracks/startrack/Ethereal_Spectrum.music main/trunk/data/tracks/startrack/Ethereal_Spectrum.ogg main/trunk/data/tracks/startrack/License.txt main/trunk/data/tracks/startrack/Metal-plate.png main/trunk/data/tracks/startrack/Saucer.b3d main/trunk/data/tracks/startrack/Window.png main/trunk/data/tracks/startrack/earth.b3d main/trunk/data/tracks/startrack/graph.xml main/trunk/data/tracks/startrack/jupiter.b3d main/trunk/data/tracks/startrack/light1.png main/trunk/data/tracks/startrack/light2.png main/trunk/data/tracks/startrack/light3.png main/trunk/data/tracks/startrack/mars.b3d main/trunk/data/tracks/startrack/materials.xml main/trunk/data/tracks/startrack/mercury.b3d main/trunk/data/tracks/startrack/moon.b3d main/trunk/data/tracks/startrack/moon.jpg main/trunk/data/tracks/startrack/neptune.b3d main/trunk/data/tracks/startrack/planet_earth1.jpg main/trunk/data/tracks/startrack/planet_jupiter.jpg main/trunk/data/tracks/startrack/planet_mars.jpg main/trunk/data/tracks/startrack/planet_merkur.jpg main/trunk/data/tracks/startrack/planet_neptun.jpg main/trunk/data/tracks/startrack/planet_pluto.jpg main/trunk/data/tracks/startrack/planet_saturn.jpg main/trunk/data/tracks/startrack/planet_saturn_rings.png main/trunk/data/tracks/startrack/planet_uranus.jpg main/trunk/data/tracks/startrack/planet_venus.jpg main/trunk/data/tracks/startrack/pluto.b3d main/trunk/data/tracks/startrack/purplenebula_bk.jpg main/trunk/data/tracks/startrack/purplenebula_ft.jpg main/trunk/data/tracks/startrack/quads.xml main/trunk/data/tracks/startrack/saturn-rings.b3d main/trunk/data/tracks/startrack/saturn.b3d main/trunk/data/tracks/startrack/scene.xml main/trunk/data/tracks/startrack/screenshot-startrack.png main/trunk/data/tracks/startrack/star_sun.jpg main/trunk/data/tracks/startrack/startrack.png main/trunk/data/tracks/startrack/startrack2.png main/trunk/data/tracks/startrack/startrack3.png main/trunk/data/tracks/startrack/startrack_track.b3d main/trunk/data/tracks/startrack/sun.b3d main/trunk/data/tracks/startrack/track.xml main/trunk/data/tracks/startrack/uranus.b3d main/trunk/data/tracks/startrack/venus.b3d Modified: main/trunk/data/CREDITS =================================================================== --- main/trunk/data/CREDITS 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/CREDITS 2013-10-14 23:09:57 UTC (rev 14260) @@ -83,6 +83,12 @@ ++++++ Added: main/trunk/data/tracks/startrack/Box.b3d =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/Box.b3d =================================================================== --- main/trunk/data/tracks/startrack/Box.b3d 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/Box.b3d 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/Box.b3d ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: main/trunk/data/tracks/startrack/Ethereal_Spectrum.music =================================================================== --- main/trunk/data/tracks/startrack/Ethereal_Spectrum.music 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/Ethereal_Spectrum.music 2013-10-14 23:09:57 UTC (rev 14260) @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<music title = "Ethereal Spectrum" - composer = "Asha B." - file = "Ethereal_Spectrum.ogg" /> Deleted: main/trunk/data/tracks/startrack/Ethereal_Spectrum.ogg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/License.txt =================================================================== --- main/trunk/data/tracks/startrack/License.txt 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/License.txt 2013-10-14 23:09:57 UTC (rev 14260) @@ -1,14 +0,0 @@ -This track, and the startrack2 / startrack3 textures are released under the GNU GPL version 2 (or later). -~~ -all planet-texture-maps were taken from Celestia (www.shatters.net/celestia/) and are licensed under the GPL. -~~ -purplenebula_* by Marianne Gagnon (Auria), release under CC-BY-SA 3.0 -~~ -Adding all planets and the sun and creating the Saturn-rings-Texture done by A.Billing (Needer) -based on work from the initial (Super)TuxKart contributors. - - -Metal-plate.png and Window.png by Rudy85, released under CC-BY-SA 3.0 -Light*.png by Marianne Gagnon, with modifications by Rudy85, released under CC-BY-SA 3.0 - -Saucer model by Rudy85 \ No newline at end of file Added: main/trunk/data/tracks/startrack/License.txt =================================================================== --- main/trunk/data/tracks/startrack/License.txt (rev 0) +++ main/trunk/data/tracks/startrack/License.txt 2013-10-14 23:09:57 UTC (rev 14260) @@ -0,0 +1,146 @@ + + + +babel-textures: + babel-trim11c.jpg + By Georges "TRaK" Grondin + dr...@gm... + http://trak.gigacities.net/ + GPL +------------------------------------------------- +trak2: + trak2_holes1a.png + By Georges "TRaK" Grondin + dr...@gm... + http://www.mercenariesguild.net/trak/ + GPL +------------------------------------------------- +trak3: + trak3_base1.png + trak3_base1-2.png + trak3_corrug1a.png + trak3_light1a.png + trak3_light1b.png + trak3_panel3d.png + trak3_screen.png + trak3_plate1.png + supp1k.png (selfmade from trak3_supp1k.tga) + + By Georges "TRaK" Grondin + dr...@gm... + http://www.mercenariesguild.net/trak/ + GPL +------------------------------------------------- +trak5: + base1c.jpg + basictrim1a.jpg + comp1a.jpg + pipe1a.jpg + pipe1a-core.png (selfmade from pipe1a.jpg) + pipe1c.jpg + pipez1a.jpg + ribs1a.jpg + tile3b.jpg + trim1a.jpg + trim4b.jpg + trim6e.jpg + trim8b.jpg + vertpanel1b.jpg + vertpanel2b.jpg + wall1b.jpg + wall3b.jpg + thing.png (selfmade from base1c.jpg) + ceil1_inner.png (selfmade from ceil1a.jpg) + ceil1_outer.png (selfmade from ceil1a.jpg) + grate1a.jpg + By Georges "TRaK" Grondin + dr...@gm... + http://www.mercenariesguild.net/trak/ + MIT license +------------------------------------------------- +http://opengameart.org: + + + bomber_metal1b.jpg + cromwatertower2.jpg + brushedbarrel.jpg + golgotha_useful + from Crack.com, Submitted by bart + CC0 + + + ab_crate_a.png + Crates of the Future + from H-Hour + GPL 2.0 + + xeon6.ogg, + from bart + CC-BY-SA 3.0, + length is adjusted to 2:37 min, because the original is too long. + + + +------------------------------------------------- +STK: textures with "*" are changed + + metal_plates.png* + by Dakal, CC-BY-SA 3.0 + + concrete_plain* + by Ivar ten Cate (Varivar), released under CC-BY-SA (va...@gm...) + concrete_plain_dark (selfmade from concrete_plain) + from stk + + bzzt2.ogg (at the moment unused) + (changed version from bzzt.ogg, that is released under the GNU GPL) + +tracks/xr: + marsrobot5.jpg* + dual-licensed under both GPL and CC-BY-SA + metaloverlap.png* + arc1.png + arc2.png + +tracks/mines: + metal_rusted.jpg* + lightHaloY + lightHaloB (selfmade from lightHaloY) + modern_mine_beam.png + textures from mines-track are licensed under CC BY-SA 3.0 +tracks/minigolf: + stone.jpg* + + +------------------------------------------------ +other files + +window.png (selfmade) +img_0572 based on an image from BurningWell + + + + + + + + + + + + + + + + + + + + + + + + + + + Deleted: main/trunk/data/tracks/startrack/Metal-plate.png =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/Saucer.b3d =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/Window.png =================================================================== (Binary files differ) Added: main/trunk/data/tracks/startrack/Window.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/Window.png =================================================================== --- main/trunk/data/tracks/startrack/Window.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/Window.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/Window.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/ab_crate_a.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/ab_crate_a.png =================================================================== --- main/trunk/data/tracks/startrack/ab_crate_a.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/ab_crate_a.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/ab_crate_a.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/arc1.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/arc1.png =================================================================== --- main/trunk/data/tracks/startrack/arc1.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/arc1.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/arc1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/arc2.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/arc2.png =================================================================== --- main/trunk/data/tracks/startrack/arc2.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/arc2.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/arc2.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/babel-trim11c.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/babel-trim11c.jpg =================================================================== --- main/trunk/data/tracks/startrack/babel-trim11c.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/babel-trim11c.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/babel-trim11c.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/base1c.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/base1c.jpg =================================================================== --- main/trunk/data/tracks/startrack/base1c.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/base1c.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/base1c.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/basictrim1a.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/basictrim1a.jpg =================================================================== --- main/trunk/data/tracks/startrack/basictrim1a.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/basictrim1a.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/basictrim1a.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/bild.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/bild.png =================================================================== --- main/trunk/data/tracks/startrack/bild.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/bild.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/bild.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/bomber_metal1b.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/bomber_metal1b.jpg =================================================================== --- main/trunk/data/tracks/startrack/bomber_metal1b.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/bomber_metal1b.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/bomber_metal1b.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/brushedbarrel.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/brushedbarrel.jpg =================================================================== --- main/trunk/data/tracks/startrack/brushedbarrel.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/brushedbarrel.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/brushedbarrel.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/bzzt2.ogg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/bzzt2.ogg =================================================================== --- main/trunk/data/tracks/startrack/bzzt2.ogg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/bzzt2.ogg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/bzzt2.ogg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/ceil1_inner.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/ceil1_inner.png =================================================================== --- main/trunk/data/tracks/startrack/ceil1_inner.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/ceil1_inner.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/ceil1_inner.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/ceil1_outer.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/ceil1_outer.png =================================================================== --- main/trunk/data/tracks/startrack/ceil1_outer.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/ceil1_outer.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/ceil1_outer.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/comp1a.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/comp1a.jpg =================================================================== --- main/trunk/data/tracks/startrack/comp1a.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/comp1a.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/comp1a.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/concrete_plain.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/concrete_plain.png =================================================================== --- main/trunk/data/tracks/startrack/concrete_plain.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/concrete_plain.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/concrete_plain.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/concrete_plain_dark.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/concrete_plain_dark.png =================================================================== --- main/trunk/data/tracks/startrack/concrete_plain_dark.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/concrete_plain_dark.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/concrete_plain_dark.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/cromwatertower2.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/cromwatertower2.jpg =================================================================== --- main/trunk/data/tracks/startrack/cromwatertower2.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/cromwatertower2.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/cromwatertower2.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: main/trunk/data/tracks/startrack/earth.b3d =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/graph.xml =================================================================== --- main/trunk/data/tracks/startrack/graph.xml 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/graph.xml 2013-10-14 23:09:57 UTC (rev 14260) @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<!-- Generated with script from SVN rev 12125 --> -<graph> - <!-- First define all nodes of the graph, and what quads they represent --> - <node-list from-quad="0" to-quad="189"/> <!-- map each quad to a node --> - <!-- Define the main loop --> - <edge-loop from="0" to="189"/> -</graph> Added: main/trunk/data/tracks/startrack/graph.xml =================================================================== --- main/trunk/data/tracks/startrack/graph.xml (rev 0) +++ main/trunk/data/tracks/startrack/graph.xml 2013-10-14 23:09:57 UTC (rev 14260) @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!-- Generated with script from SVN rev Unknown --> +<graph> + <!-- First define all nodes of the graph, and what quads they represent --> + <node-list from-quad="0" to-quad="295"/> <!-- map each quad to a node --> + <!-- Define the main loop --> + <edge-loop from="0" to="216"/> + <!-- Shortcut add driveline 4 --> + <edge from="103" to="217"/> + <edge-line from="217" to="240"/> + <edge from="240" to="125"/> + <!-- Shortcut add driveline 2 --> + <edge from="112" to="241"/> + <edge-line from="241" to="250"/> + <edge from="250" to="231"/> + <!-- Shortcut add driveline 3 --> + <edge from="20" to="251"/> + <edge-line from="251" to="283"/> + <edge from="283" to="50"/> + <!-- Shortcut add driveline 1 --> + <edge from="188" to="284"/> + <edge-line from="284" to="295"/> + <edge from="295" to="201"/> +</graph> Added: main/trunk/data/tracks/startrack/grate1a.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/grate1a.jpg =================================================================== --- main/trunk/data/tracks/startrack/grate1a.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/grate1a.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/grate1a.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/img_0572.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/img_0572.jpg =================================================================== --- main/trunk/data/tracks/startrack/img_0572.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/img_0572.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/img_0572.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: main/trunk/data/tracks/startrack/jupiter.b3d =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/light1.png =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/light2.png =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/light3.png =================================================================== (Binary files differ) Added: main/trunk/data/tracks/startrack/lightHaloB.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightHaloB.png =================================================================== --- main/trunk/data/tracks/startrack/lightHaloB.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightHaloB.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightHaloB.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightHaloY.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightHaloY.png =================================================================== --- main/trunk/data/tracks/startrack/lightHaloY.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightHaloY.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightHaloY.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_core.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_core.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_core.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_core.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_core.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_no_room.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_no_room.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_no_room.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_no_room.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_no_room.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_no_room_edges.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_no_room_edges.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_no_room_edges.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_no_room_edges.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_no_room_edges.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_other1.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_other1.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_other1.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_other1.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_other1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_other2.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_other2.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_other2.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_other2.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_other2.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_other3.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_other3.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_other3.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_other3.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_other3.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_other4.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_other4.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_other4.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_other4.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_other4.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_other5.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_other5.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_other5.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_other5.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_other5.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_1.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_1.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_1.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_1.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_2a.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_2a.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_2a.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_2a.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_2a.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_2b.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_2b.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_2b.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_2b.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_2b.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_2c.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_2c.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_2c.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_2c.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_2c.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_2d.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_2d.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_2d.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_2d.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_2d.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_3a.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_3a.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_3a.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_3a.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_3a.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_3b.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_3b.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_3b.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_3b.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_3b.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_3c.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_3c.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_3c.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_3c.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_3c.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_4.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_4.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_4.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_4.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_4.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_5a.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_5a.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_5a.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_5a.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_5a.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_5b.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_5b.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_5b.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_5b.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_5b.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_room_5c.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_room_5c.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_room_5c.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_room_5c.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_room_5c.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_space.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_space.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_space.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_space.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_space.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/lightmap_start.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/lightmap_start.png =================================================================== --- main/trunk/data/tracks/startrack/lightmap_start.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/lightmap_start.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/lightmap_start.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: main/trunk/data/tracks/startrack/mars.b3d =================================================================== (Binary files differ) Added: main/trunk/data/tracks/startrack/marsrobot5.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/marsrobot5.jpg =================================================================== --- main/trunk/data/tracks/startrack/marsrobot5.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/marsrobot5.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/marsrobot5.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: main/trunk/data/tracks/startrack/materials.xml =================================================================== --- main/trunk/data/tracks/startrack/materials.xml 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/materials.xml 2013-10-14 23:09:57 UTC (rev 14260) @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<!-- Generated with script from SVN rev Unknown --> -<materials> - <material name="flaring-star.png" compositing="blend"/> - <material name="light1.png" compositing="additive" light="N" disable-z-write="Y" clampu="Y"/> - <material name="light2.png" compositing="additive" light="N" disable-z-write="Y" clampu="Y"/> - <material name="light3.png" compositing="additive" light="N" disable-z-write="Y" clampu="Y"/> - <material name="planet_saturn_rings.png" light="N" compositing="blend"/> - <material name="startrack3.png" light="N" compositing="blend"/> - <material name="transparence.png" reset="Y" compositing="test"/> -</materials> Added: main/trunk/data/tracks/startrack/materials.xml =================================================================== --- main/trunk/data/tracks/startrack/materials.xml (rev 0) +++ main/trunk/data/tracks/startrack/materials.xml 2013-10-14 23:09:57 UTC (rev 14260) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<!-- Generated with script from SVN rev Unknown --> +<materials> + <material name="arc1.png" light="N" backface-culling="N" compositing="blend" disable-z-write="Y"/> + <material name="arc2.png" light="N" backface-culling="N" compositing="blend" disable-z-write="Y"/> + <material name="ceil1_outer.png" compositing="test"/> + <material name="drtest.png" ignore="Y"/> + <material name="drtest.png" ignore="Y"/> + <material name="lightHaloB.png" light="N" compositing="blend"/> + <material name="lightHaloY.png" light="N" compositing="blend"/> + <material name="pipe1a-core.png" light="N"/> + <material name="reset.png" compositing="test" disable-z-write="Y" falling-effect="Y" reset="Y"/> + <material name="supp1k.png" light="N" compositing="test"/> + <material name="window.png" light="N" compositing="blend" sphere="Y"/> +</materials> Deleted: main/trunk/data/tracks/startrack/mercury.b3d =================================================================== (Binary files differ) Added: main/trunk/data/tracks/startrack/metal_plates.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/metal_plates.png =================================================================== --- main/trunk/data/tracks/startrack/metal_plates.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/metal_plates.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/metal_plates.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/metal_rusted.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/metal_rusted.jpg =================================================================== --- main/trunk/data/tracks/startrack/metal_rusted.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/metal_rusted.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/metal_rusted.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/metaloverlap.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/metaloverlap.png =================================================================== --- main/trunk/data/tracks/startrack/metaloverlap.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/metaloverlap.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/metaloverlap.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/modern_mine_beam.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/modern_mine_beam.png =================================================================== --- main/trunk/data/tracks/startrack/modern_mine_beam.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/modern_mine_beam.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/modern_mine_beam.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: main/trunk/data/tracks/startrack/moon.b3d =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/moon.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/neptune.b3d =================================================================== (Binary files differ) Added: main/trunk/data/tracks/startrack/pipe1a-core.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/pipe1a-core.png =================================================================== --- main/trunk/data/tracks/startrack/pipe1a-core.png 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/pipe1a-core.png 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/pipe1a-core.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/pipe1a.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/pipe1a.jpg =================================================================== --- main/trunk/data/tracks/startrack/pipe1a.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/pipe1a.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/pipe1a.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/pipe1c.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/pipe1c.jpg =================================================================== --- main/trunk/data/tracks/startrack/pipe1c.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/pipe1c.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/pipe1c.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/tracks/startrack/pipez1a.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/startrack/pipez1a.jpg =================================================================== --- main/trunk/data/tracks/startrack/pipez1a.jpg 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/pipez1a.jpg 2013-10-14 23:09:57 UTC (rev 14260) Property changes on: main/trunk/data/tracks/startrack/pipez1a.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: main/trunk/data/tracks/startrack/planet_earth1.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_jupiter.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_mars.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_merkur.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_neptun.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_pluto.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_saturn.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_saturn_rings.png =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_uranus.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/planet_venus.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/pluto.b3d =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/purplenebula_bk.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/purplenebula_ft.jpg =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/startrack/quads.xml =================================================================== --- main/trunk/data/tracks/startrack/quads.xml 2013-10-14 22:45:15 UTC (rev 14259) +++ main/trunk/data/tracks/startrack/quads.xml 2013-10-14 23:09:57 UTC (rev 14260) @@ -1,195 +0,0 @@ -<?xml version="1.0"?> -<!-- Generated with script from SVN rev 12125 --> -<quads> - <!-- Driveline: Driveline --> - <quad p0="-12.299 -1.456 35.090" p1="9.301 -1.218 35.818" p2="8.493 -1.043 45.309" p3="-13.119 -1.273 41.257"/> - <quad p0="0:3" p1="0:2" p2="7.072 -1.332 54.687" p3="-14.653 -1.555 48.991"/> - <quad p0="1:3" p1="1:2" p2="4.373 -1.690 64.326" p3="-16.941 -1.911 57.016"/> - <quad p0="2:3" p1="2:2" p2="0.874 -2.047 73.959" p3="-19.916 -2.267 65.456"/> - <quad p0="3:3" p1="3:2" p2="-3.507 -2.324 83.298" p3="-24.013 -2.544 74.735"/> - <quad p0="4:3" p1="4:2" p2="-7.852 -2.485 92.236" p3="-28.297 -2.704 84.313"/> - <quad p0="5:3" p1="5:2" p2="-11.232 -2.399 100.374" p3="-31.934 -2.618 93.865"/> - <quad p0="6:3" p1="6:2" p2="-13.803 -2.105 108.021" p3="-34.856 -2.325 103.362"/> - <quad p0="7:3" p1="7:2" p2="-15.131 -1.484 115.092" p3="-36.463 -1.704 112.729"/> - <quad p0="8:3" p1="8:2" p2="-15.668 -0.705 121.747" p3="-37.165 -0.925 121.758"/> - <quad p0="9:3" p1="9:2" p2="-15.209 0.187 127.821" p3="-36.652 -0.033 129.965"/> - <quad p0="10:3" p1="10:2" p2="-14.216 1.104 133.785" p3="-35.530 0.884 137.677"/> - <quad p0="11:3" p1="11:2" p2="-12.698 1.991 140.024" p3="-33.903 1.772 144.847"/> - <quad p0="12:3" p1="12:2" p2="-10.971 2.844 146.534" p3="-32.125 2.625 151.729"/> - <quad p0="13:3" p1="13:2" p2="-9.176 3.634 153.492" p3="-30.400 3.414 158.329"/> - <quad p0="14:3" p1="14:2" p2="-7.507 4.376 160.762" p3="-28.859 4.156 164.777"/> - <quad p0="15:3" p1="15:2" p2="-6.270 5.045 168.449" p3="-27.775 4.825 171.072"/> - <quad p0="16:3" p1="16:2" p2="-5.479 5.654 176.315" p3="-27.098 5.434 177.292"/> - <quad p0="17:3" p1="17:2" p2="-5.504 6.166 184.236" p3="-27.104 5.946 183.421"/> - <quad p0="18:3" p1="18:2" p2="-6.040 6.584 191.915" p3="-27.522 6.365 189.313"/> - <quad p0="19:3" p1="19:2" p2="-7.199 6.837 198.883" p3="-28.420 6.618 194.624"/> - <quad p0="20:3" p1="20:2" p2="-8.729 6.985 205.446" p3="-29.587 6.765 199.606"/> - <quad p0="21:3" p1="21:2" p2="-10.713 7.002 211.606" p3="-31.059 6.782 204.249"/> - <quad p0="22:3" p1="22:2" p2="-13.055 6.954 217.542" p3="-32.734 6.734 208.633"/> - <quad p0="23:3" p1="23:2" p2="-15.979 6.856 223.216" p3="-34.695 6.637 212.601"/> - <quad p0="24:3" p1="24:2" p2="-19.374 6.753 228.666" p3="-36.866 6.533 216.258"/> - <quad p0="25:3" p1="25:2" p2="-23.528 6.686 233.719" p3="-39.349 6.466 219.445"/> - <quad p0="26:3" p1="26:2" p2="-28.248 6.669 238.391" p3="-42.023 6.449 222.274"/> - <quad p0="27:3" p1="27:2" p2="-33.791 6.758 242.348" p3="-44.915 6.538 224.538"/> - <quad p0="28:3" p1="28:2" p2="-39.772 6.925 245.584" p3="-47.820 6.705 226.297"/> - <quad p0="29:3" p1="29:2" p2="-46.135 7.203 247.484" p3="-50.580 6.984 227.183"/> - <quad p0="30:3" p1="30:2" p2="-52.517 7.546 248.447" p3="-53.396 7.326 227.500"/> - <quad p0="31:3" p1="31:2" p2="-58.577 7.956 248.133" p3="-56.552 7.736 227.076"/> - <quad p0="32:3" p1="32:2" p2="-64.262 8.394 247.226" p3="-60.097 8.174 226.240"/> - <quad p0="33:3" p1="33:2" p2="-69.243 8.844 245.930" p3="-64.379 8.624 224.982"/> - <quad p0="34:3" p1="34:2" p2="-73.735 9.283 244.633" p3="-69.206 9.063 223.660"/> - <quad p0="35:3" p1="35:2" p2="-77.596 9.677 243.702" p3="-74.819 9.458 222.604"/> - <quad p0="36:3" p1="36:2" p2="-81.244 10.022 243.209" p3="-80.972 9.802 222.074"/> - <quad p0="37:3" p1="37:2" p2="-85.007 10.267 243.606" p3="-87.892 10.047 222.777"/> - <quad p0="38:3" p1="38:2" p2="-89.468 10.426 244.859" p3="-95.473 10.207 224.540"/> - <quad p0="39:3" p1="39:2" p2="-95.695 10.441 247.621" p3="-104.119 10.221 228.025"/> - <quad p0="40:3" p1="40:2" p2="-102.603 10.343 251.214" p3="-113.073 10.123 232.488"/> - <quad p0="41:3" p1="41:2" p2="-109.569 10.073 255.636" p3="-121.810 9.854 238.008"/> - <quad p0="42:3" p1="42:2" p2="-116.232 9.707 260.517" p3="-130.161 9.487 244.222"/> - <quad p0="43:3" p1="43:2" p2="-122.043 9.237 265.921" p3="-137.667 9.017 251.397"/> - <quad p0="44:3" p1="44:2" p2="-127.129 8.727 271.653" p3="-144.404 8.507 259.251"/> - <quad p0="45:3" p1="45:2" p2="-131.025 8.207 277.815" p3="-149.784 7.988 268.062"/> - <quad p0="46:3" p1="46:2" p2="-134.044 7.713 284.211" p3="-154.049 7.493 277.387"/> - <quad p0="47:3" p1="47:2" p2="-135.760 7.299 290.791" p3="-156.... [truncated message content] |
From: <de...@us...> - 2013-10-23 17:23:19
|
Revision: 14298 http://sourceforge.net/p/supertuxkart/code/14298 Author: deveee Date: 2013-10-23 17:23:17 +0000 (Wed, 23 Oct 2013) Log Message: ----------- Some missing files and other warnings Modified Paths: -------------- main/trunk/data/karts/gnu/kart.xml main/trunk/data/karts/xfcemouse/kart.xml main/trunk/data/tracks/lighthouse/materials.xml main/trunk/data/tracks/startrack/materials.xml Added Paths: ----------- main/trunk/data/sfx/WilhelmScream.ogg main/trunk/data/tracks/snowmountain/eyes.jpg main/trunk/data/tracks/startrack/window.png Removed Paths: ------------- main/trunk/data/tracks/startrack/Window.png Modified: main/trunk/data/karts/gnu/kart.xml =================================================================== --- main/trunk/data/karts/gnu/kart.xml 2013-10-23 11:43:43 UTC (rev 14297) +++ main/trunk/data/karts/gnu/kart.xml 2013-10-23 17:23:17 UTC (rev 14298) @@ -20,6 +20,4 @@ start-losing-loop = "473" end-losing = "479"/> <hat offset = "0.0 0.245 0.15"/> - <wheels> - </wheels> </kart> Modified: main/trunk/data/karts/xfcemouse/kart.xml =================================================================== --- main/trunk/data/karts/xfcemouse/kart.xml 2013-10-23 11:43:43 UTC (rev 14297) +++ main/trunk/data/karts/xfcemouse/kart.xml 2013-10-23 17:23:17 UTC (rev 14298) @@ -24,5 +24,5 @@ <nitro-emitter-a position = "0.355961 0.446362 -0.547407" /> <nitro-emitter-b position = "-0.355961 0.446362 -0.547407" /> </nitro-emitter> - <hat offset="0.0 0.05 0.07"/> + <hat offset="0.0 0.05 0.07"/> </kart> Added: main/trunk/data/sfx/WilhelmScream.ogg =================================================================== --- main/trunk/data/sfx/WilhelmScream.ogg (rev 0) +++ main/trunk/data/sfx/WilhelmScream.ogg 2013-10-23 17:23:17 UTC (rev 14298) @@ -0,0 +1,124 @@ +OggS+\xB2 +++\x9A \xAD9\xE7\x9C'\xB1yК*\xAD9\xE7\x9Cq\xCE\xE9`\x9C\xC69\xE7\x9C&\xADy\x90\x9A\x8D\xB59\xE7\x9C\xADi\x8E\x9AK\xB19\xE7\x9CH\xB9yR\x9BK\xB59\xE7\x9Cs\xCE9\xE7\x9Cs\xCE9\xE7\x9C\xEA\xC5\xE9\x9C\xCE9眨\xBD\xB9\x96\x9B\xD0\xC59\xE7\x9CO\xC6\xE9ޜ\xCE9\xE7\x9Cs\xCE9\xE7\x9Cs\xCE9\xE7\x9C 4d+BCV+*\xA8\x80АU\x98&\xC03M\x88"D\xA6 +B*%\x95R+!\x84\x94R +!\x84RB\xA1\x84\x94RJ)\x85B\xA5\x94\x92RJ)\xA5J %\x84R))\xA5J!\x94RJJ)\xA5TJ \xA1\x84J)%\xA5\x94RJ!\x84J)+\xF8O\x8B\x8Ek\xA1U\xEA\xAF\xF22ʯ\x80?Z\x9Ch\xE2+A\xE05+\xA4٪\x8D5CD++\xA5+!\xF0+L\xEF\xC6\xE0\x90h\\xAC \xAA\xD3\xCD+(\xB73\x81\xBA\xC3-\xEF\xF5i\xF9\xD3\xC3Om\xFC\xA0y˕\xA1\x86\x9E\xA9ǂ^f\xFA\xEB\xA8lLs+\xA0+\xBA\xAA\xED\x8E\xAF\xEE\xD0+\x80$\xB0!(Ʊ8U\xF1\xA1\xB0e0 m +`\x90J\xC5jKR\xA9\xA8RPJG\xB5 \xEFN\xD0b\xE3 +\x88\xB8\xB8++\xB5\xB2\xABڴ\xAAU+\xD5vI\x89\xA6}m+\xBE)Ί\xCD\x91\x96\xFF\xCF\xF0\xFBrT\x8E\xF3t\xB3\xD7e\xAE\x84\x97\xF5ߔ9 \xD7\xF7\xEF \x88\xC8xZ+ \xE5\x95%\x83\x94\x81\xB6i\xA8NGz\x82\xC2xF`\xF8T\xABA}U1"bd\x80\xAC;\x9Ap\x80\x94 +\x80+\xE2P\x80\xD0uE\x89\x93^)ŤU-K\xA6++\xB5:*\x80\x80*\x95\xA3\xA2" +\x80\xF8dO\xA1\xC1\xC8r\xBAP\xAA +B\xB4\xA2B\xAA$M۶=[yL\xB8j\xEBTH\x90]= 4XEh\xB0\x8A\xA6\xD1F\xBA=\xAA\x82@\xD0+\xC0\x8AV\xF6\xCD\xF6\xE4B\xA9\xBFY\xFFmO[\xF1 \xAD\xEC\xFD\xDD +\xDDo\xAEǓV\xA0\xDC%/+>\x9AV\x8E\xCD\xEAȅ\x92\x89\xFF\xB6\x8712\x9AV\xB7\x9B\xD57\x90!\xFF\xC6\xDF\xF6\xE22\xEE\x88\xF5I\xAB6\xC1t\x99.S++\x8D\xB6\xD3I\xAA\xEDx++\xE9O֮\x88l\x96\xF5[\xB1+ٜ\xBF\xBFD)b@\x81+\xD1Uf\xB3\xDAM\xD3̝4q\xEDW\xB6M-\x97&\xEBK\x95\xC5\xF6\xDB@H\x80k\x80aUU00{\x83\xF1t\xF7\xF2\xFA\xD4I \xD1\xF4HSh\xF2\xFD\xB5d_\xAF\xF3ֲ\xF7\\xC6\xE3++\xA5\xDB-\x90\xFC\x8D$|++\xB0+\xC1\xA6Z\xD50\xC4b ++++.\xB2\xF3}'\xA9l\xFD\xD5\x9F\xF8c8JP\xD8Z\xB9\xA8\xCDd\xFEW]@\xED\xFE\x97\xFD +~\\xF2G\xFAwM\xDC\xDA\xC1\xFF\xA2M\xA8w\xFF\xCB\xFE~R\xFA\xCF\xD5\xCF\xF9++\xA82X\xC1+\x89\xA7\xD0\xCA\xFFjd+\xB8{\xBA.\xE4\xD9m\x8C\xCB/+\xA0@C\x89 +\xC0 +\x83(+\xB4`c\x82oU5>͏\xB9W'\xAE2\xF0\xBE\xEC\xB0\xFA\xE0\xAEGƓ\xDE\xF7\xF7\xB6#m nM\xAB\xE8¯\x93\xF4\xF7~\xBD\x9D\xA3W\xE6Mr)ҍ\x90E\xE0 f\x80[ӠOggS+\xFD\x95t\xEF\xAC\xFF+\xA0\x92T\x882+7+\x95\xDE١\x9F-\xE3\xFDG\xBB-\x9D\xF2+\x91\x90\xE9\x9DE\x80\x88+ +\x90\xC2@\xDA\xED\xA4*\xD9:e-%LH\x8B\x9E\xCE<D\xB7(\x84+iQ8Uq\xE9V: +\xA0\xDDo2+ls\xEB*\xCAi<=$\xE0k+\xDB>q\xC0\xC1 +=\x86\xF0N\xB4]\xEF}\xF0x=n\x8EX\xC7\xEAI\xA4\xD3\xEF\xCC\xA9R\xE4\xFCz\xC2h\xE1$\xE9ޡb\xA5\x95~\x82}\x87\xD9n\x84\xF9n\x92\xF5괐\\xE7\xDD'c;\x98:\xA7\xC5)\x861\xAB\x8E\x98\xBAi1\xA2٢_m +_\x99w\x98hB!\xAD0d\x80++\xD2\xCC& +Y\xE2x\xD8\xD3F\xA2\xA9\x9B{\xB1\xAEXYrI!Y\xBB\x9A\xB1 +\xE4\xC3\xCC\x80\xA4\xC8\xFCY\xB5\xA9\x91\xC1l\xCDD-\xFEIO\xD9 G\xB6\xB0ф\x99y<mg\xBA\x8Fm{\x99$\xC9JGӗz\xDE\xCB\xF4\xF4\xE10}\xBDl\xA7\x91gz^\xE5\xF6Ea\x{DC7C}N5\xDB;\xFE\xB4WӰK\xB9ҡJYW^\xCA[\x9F\x85v/wn@Ag\xB6\ No newline at end of file Modified: main/trunk/data/tracks/lighthouse/materials.xml =================================================================== --- main/trunk/data/tracks/lighthouse/materials.xml 2013-10-23 11:43:43 UTC (rev 14297) +++ main/trunk/data/tracks/lighthouse/materials.xml 2013-10-23 17:23:17 UTC (rev 14298) @@ -16,7 +16,7 @@ <material name="sea-bed.jpg" collision-detect="Y" falling-effect="Y" water-splash="Y" collision-reaction="reset"/> <material name="sea.png" compositing="blend" disable-z-write="Y" falling-effect="Y" graphical-effect="water_shader" surface="Y"> <sfx filename="splash.ogg" min_speed="5.00" max_speed="15.00" min_pitch="0.80" max_pitch="1.20" positional="Y" rolloff="0.10"/> - <particles base="splash.xml" condition=" drive skid"/> + <particles base="splash.xml" condition="drive skid"/> </material> <material name="trail_diff.png" compositing="blend" disable-z-write="Y"/> <material name="tree_1.png" backface-culling="N" compositing="blend" disable-z-write="Y" graphical-effect="grass"/> Added: main/trunk/data/tracks/snowmountain/eyes.jpg =================================================================== --- main/trunk/data/tracks/snowmountain/eyes.jpg (rev 0) +++ main/trunk/data/tracks/snowmountain/eyes.jpg 2013-10-23 17:23:17 UTC (rev 14298) @@ -0,0 +1,43 @@ +\xFF\xD8\xFF\xE0+ + + + +\xFF\xDB+\xFF\xC4+"2#BRs\x81\x82\x83\x91\x92\xA1\xB1\xC1\xD1%'3Ccr\xA2\xB2\xFF\xC4+\x95\xFF+\xA2q\x97\x9D\xDFP\xF2\xA8q\xE8\x91\xA5\x9B\xDD6 \xDFa\xFCp\xDBn\xE1N\x9F\xFAw,C1\x944g\x87.ڢ\x83\xD4\xEC3^\xF4\xCA \xB8\xD3k\x8FN\x86\xA5\x95\xAC\xC5u\x82\xAE\xD69\x9CҘl\x9C\xCD9\xB7\xBCSH+(F\xE2x\x9D3(k\xE9Pk:_l\xF8\xFC\xF0)b\xAE \xF6\xFE\xB9\xC9EQ\xA7LG\xC9Oe7PBU\x94\xFCҝ}R\xF9\x94;qP\xAF \xDD/4\xB4\x85!Cȅ\x8C\xAB\x87&\x85w\xD6=\xB30=\x87t(\xF3\xA8σ\x93\xBCD\xCA%O\x96fu\xE4krV\xF4\x9F\x881\xBA\xDFP\xF2Ѝ\xFF+\xCA\xF1\xD5C\xAAj\xA1\xA3g\x91\xF9R\xC3\xF6IK2#,e2 +q\x844 \x98J\xA1\xF5\xD7o\x89G\xCE\xF8\xAE\xAA\x9C\xCA\xED\xD6\xCE\xC7je\xB6\x9D\xAD\xE5\xD5os\xBE"\xABħ\xF0\xC0AP\xDB\xC3*WM\xB7\xC0C+ȯiƪ\xDA6a/\x8DBV\x88\x86T\x9B\x87\xA0\x90\xC6\xF0T;\x8D0\xAB\xA7|n-\xCB\xF6\xFB\xE6XR\xA9+j\xBB\x92\xAA)\xB6\x80\xB2U\xEFS\xE7ؾ\xAFыK\x93:\x90\xB5\xE1s\xDE\x90\xD1VMH\xEF:\x8F\xA2\xDB8t˖sK\x99f\xD7Ӡ"/\x8F2\xE9iX\xBFf\x86Kd\xFE\xB8]\xB0RIѤk}SԔ\xE2\xE9\x9AS\xA8a\xD1@_sk\x8Ac\x90pWH\xE6+\x80>x*\xE3\xD7\x9A\x87Q\xFC\xF0J\xA1\xABc\xD1W0\x89\xDBa\xB9\xBF\xFE\xF3 +\xCBy\xC2 e\xB3Q&^\xEA\xBA}[N\xB3\xA7Ь\xB7\x8B\xCC\xF5)0\xB9k\xDB\xF8\x81\xA4\xECt\xFB\xA7\x87\x814\xC7\xCF\xEA٠HI\x8D\x8E\x88|\xDB\xC5n\x95\xDAqᆴ5[p\xBC\x96i<\x94I&\xDD\xDDة\xDCj\xB7\x8DK\x83F\xB0\xE7s\x98Y\xA6*:w\xCC+\x88\x89\x88ya +\xB0\xD2\xA5\xADj;%)H$\x93\xDC0x\xF2\x92\xE7i\xA7\x85\xBC`{g\xB1WQ2\x8E2ޞ\xA9\xB2\xF6Q\xEE\xEEͧ\xB1\xB7< ]\x96\xEC*[!, \x8B\xE8+'e/\xA7 +\xD1\xEA\xED\x87\xF3u,ܴy\x91P\\xD18g\x80̜\x8ASС/Ě)Ī.E\x94\x85)\x87\xB4\xFC\xC2\xCA +J\xEC\xD2A\xDBp\xE1\x94\xEC\x84B\xAA\xD7\xDF\xD7|a,\xF6\x90)\xCC\xDAS\xB9\x93$\x9D\x81\xF1J\xA6\xB2ِ#o\xF2\xA3V\xFF+\xC8\xB2>\xFB\xC8`\xC1M=\xB8p?O\xE7\xD5u&\xA5jF\xA4t;\xE0g\ {\x8F2 9\xBDC\x96\xE8\xF8\xE8\x86m\xAD\xE58=RR\xA1\xFB\xB1slnX\xE5\xCB\xF8\xE7\xDD\xD41\xE3\xD4'{\x80w\xF5&d\xD7B\x97\xC8>\xA0\xDB\\x86^ +\xB9\xE0\xB7f\xD4@\xBBwb\xAC땸ؔ\xB8.y\xFD\xB7,ʊ\x8B\xCD\x87\xA3ń\xAAi:\xF3\xED}\xA6?s<\x8C!]\xD4':c\xF7PIm\xF6\xC1'\xF1\xCA\xFF+\x95e\xC315t\xC1\xE6\xD2 +Z\xED\xF6l\x93ܨ\x87\x99O\x8E\xFEXSS8 +\xD7ZN\xD0\xCA+V\x82p\xBEE\xD5H\xCFܹ\xA7\xB8\x9A\xC9*\xAB/s\x8A\xFAJ\x96\xAC\xA5\x8FJ\xA6P\xE1Vp\xB4\xE2H\xD6ھ\xAB\x896ZOr\x92\x97L$:\xA4\x80\x85ˇ^Ϳ\x99\x9F\x91\xB4\xBERP\x93<ʦ"\xE2\x8Adu\xA0\xB5\xD8G\xB0Tt\x92\xA5\x82á6֕l +\xEC\xA27\xC3F3\x954\ \xA1\xEE\xC1;|\xD4\xE1r\xE5.9P\xF0\xE149\x92\xEC~kfى\xA8\xE2!\x94fV\xCBZ\xBB\\xB7\xC6V\xB5\xB8\xB1\xB2\x96\xABnk9wPj*\x8C\x8E\xC0\xD9s\xFA\x84\xC0Jb\xA2\xBB%\xA4\xFAa\xD6G\xCE\xEC_WRa\x89\xCE\xF9!߂ +\xF33\x8Cꂤ\x89Oi +JJ\xDCm +\xEB\xA5\xF8\xA5\x84 +\xFE\xED\xA712\xE0\xEE\x9C"5\x98\xE0\xA8 +M\xC6z\xA7x\xFB\xA7ߎ\xAAIٶL\xA6{*ATm#\xDC\xC9%;\xA8\xB3}.\x8F\xD5V\xAF\xC9\xC4*\xF2\xBC\xB7Ö\xA7\x8B\xE9\xB4]f\xFCQ\x9Eo\xA2\xBB-\xEB\xB4\xD64c+\xED5\xB2 \xE1r\xC7\xD2v{m`\xAC\xA6c\xF3\xB0^\x9B\x8E\x9E\xB8mK\xD1|\x8A\xB5u\xE8p7C +\xEE\xD9iI *+\xB2[\xDErc1gy}Q)\xDDO\xDEj\xE8\xFC2\xB7ic\xF2l=A\xC5ԤT1\xAFṶ\xCD}\xA2\xAAZ>t\xFD\xC7r\xAB\xDF|Ap\xE5+TpBKo\xE3\x82:%g)olI\xB0\xD8QY\xB0H\xB9>\xE6\xEDG\x80ZZ\x86l\xF5\g\xDF%\xCB\xEAaj\xD30|"-\xC4\xFB\xBC:wu\xC3\xE1d=H\xF8\xB5\x8C\x8AX\xE7n\xB9\xFDh\x92\xFBq\x8E\x81\x9A\xB4O\xC92 %/#\x83\x96șKR\xF6\xC3I\xE8\xDBhHJR=+M\x88\xEA0\xCAq2\xBC[\xE4\x8C]aV\xE5\xF3*]OM \x90\xD261\xF0\xDDVϚ\x85\xB5'\xCE\xE3\xBF\xA8\xEAy\x8D\xDB\x92\xE2KK\xAA\x9A*\xA0\xFF+Q\xAEԏ\xD5Y\xFB2\xD9\xCB\xE4\xB9/qZa\xA3\x8F\xDAM\xBEGy\xE8{\xF1aOY\xC89\xB2\xC6\xDD\xF8zG\xC8j\xA8\xE4x?\xA2n\xDD\xE26q\x97\xA5P\xB9\xB1N\xC7\xCA\xE2:T\xA7\xDB!#\xBD+\xE8\xA1\xE610@نAY\xC7^\xA6\xB6\xFB\xBA\xB6\xE5\xE7\xC6\xF1Pfb\x84N\xD3\xD3\x93\xEF| ,5\xF0 \xF8\xADgd\x8F3\x85YN;\xD3\xDE*\xAER0\xB98|=pc+\xA9a\xEA\xEE \xE2\x99\xCF\xD9Pv^\x83\xAE^\xAE\xE5(\x9F\x9D\xC1\xE3\xD0wbM\xC0\xF2\xF4\xE2\xD0-\x8F\x84\xCCR\x8A\xDA\xE3\x97\xF8ꈰ\x9B.\xE4\x9B\xE2\xB0h1\xE5n\xBEj\xF5|\xB84\xFF\xD9 \ No newline at end of file Deleted: main/trunk/data/tracks/startrack/Window.png =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/startrack/materials.xml =================================================================== --- main/trunk/data/tracks/startrack/materials.xml 2013-10-23 11:43:43 UTC (rev 14297) +++ main/trunk/data/tracks/startrack/materials.xml 2013-10-23 17:23:17 UTC (rev 14298) @@ -4,8 +4,6 @@ <material name="arc1.png" light="N" backface-culling="N" compositing="blend" disable-z-write="Y"/> <material name="arc2.png" light="N" backface-culling="N" compositing="blend" disable-z-write="Y"/> <material name="ceil1_outer.png" compositing="test"/> - <material name="drtest.png" ignore="Y"/> - <material name="drtest.png" ignore="Y"/> <material name="lightHaloB.png" light="N" compositing="blend"/> <material name="lightHaloY.png" light="N" compositing="blend"/> <material name="pipe1a-core.png" light="N"/> Copied: main/trunk/data/tracks/startrack/window.png (from rev 14297, main/trunk/data/tracks/startrack/Window.png) =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-10-27 23:06:56
|
Revision: 14324 http://sourceforge.net/p/supertuxkart/code/14324 Author: auria Date: 2013-10-27 23:06:54 +0000 (Sun, 27 Oct 2013) Log Message: ----------- Fix the top of the skybox in lighthouse Modified Paths: -------------- main/trunk/data/stk_config.xml main/trunk/data/tracks/lighthouse/graph.xml main/trunk/data/tracks/lighthouse/materials.xml main/trunk/data/tracks/lighthouse/quads.xml main/trunk/data/tracks/lighthouse/scene.xml main/trunk/data/tracks/lighthouse/track.xml Added Paths: ----------- main/trunk/data/tracks/lighthouse/easter_eggs.xml main/trunk/data/tracks/lighthouse/lighthouse_track.b3d main/trunk/data/tracks/lighthouse/sky_top.jpg Removed Paths: ------------- main/trunk/data/tracks/lighthouse/lighthouse-terrain_track.b3d Modified: main/trunk/data/stk_config.xml =================================================================== --- main/trunk/data/stk_config.xml 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/stk_config.xml 2013-10-27 23:06:54 UTC (rev 14324) @@ -487,7 +487,7 @@ <!-- Parameters for the speed-weighted objects: a bigger value for strength-factor leads to the speed of the kart more quickly affecting the strength of the animation (up to a maximum value that corresponds to the original animation) --> - <speed-weighted strength-factor="0.05" speed-factor="5.0"/> + <speed-weighted strength-factor="0.05" speed-factor="1.0"/> <!-- friction: slip used for bullet skidding. A high value (like 10000000) disables bullet skidding. --> Added: main/trunk/data/tracks/lighthouse/easter_eggs.xml =================================================================== --- main/trunk/data/tracks/lighthouse/easter_eggs.xml (rev 0) +++ main/trunk/data/tracks/lighthouse/easter_eggs.xml 2013-10-27 23:06:54 UTC (rev 14324) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!-- Generated with script from SVN rev 13687 --> +<EasterEggHunt> + <easy> + </easy> + <medium> + </medium> + <hard> + </hard> +</EasterEggHunt> \ No newline at end of file Property changes on: main/trunk/data/tracks/lighthouse/easter_eggs.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Modified: main/trunk/data/tracks/lighthouse/graph.xml =================================================================== --- main/trunk/data/tracks/lighthouse/graph.xml 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/tracks/lighthouse/graph.xml 2013-10-27 23:06:54 UTC (rev 14324) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 12720 --> +<!-- Generated with script from SVN rev 13687 --> <graph> <!-- First define all nodes of the graph, and what quads they represent --> <node-list from-quad="0" to-quad="114"/> <!-- map each quad to a node --> Deleted: main/trunk/data/tracks/lighthouse/lighthouse-terrain_track.b3d =================================================================== (Binary files differ) Added: main/trunk/data/tracks/lighthouse/lighthouse_track.b3d =================================================================== (Binary files differ) Index: main/trunk/data/tracks/lighthouse/lighthouse_track.b3d =================================================================== --- main/trunk/data/tracks/lighthouse/lighthouse_track.b3d 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/tracks/lighthouse/lighthouse_track.b3d 2013-10-27 23:06:54 UTC (rev 14324) Property changes on: main/trunk/data/tracks/lighthouse/lighthouse_track.b3d ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: main/trunk/data/tracks/lighthouse/materials.xml =================================================================== --- main/trunk/data/tracks/lighthouse/materials.xml 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/tracks/lighthouse/materials.xml 2013-10-27 23:06:54 UTC (rev 14324) @@ -16,7 +16,7 @@ <material name="sea-bed.jpg" collision-detect="Y" falling-effect="Y" water-splash="Y" collision-reaction="reset"/> <material name="sea.png" compositing="blend" disable-z-write="Y" falling-effect="Y" graphical-effect="water_shader" surface="Y"> <sfx filename="splash.ogg" min_speed="5.00" max_speed="15.00" min_pitch="0.80" max_pitch="1.20" positional="Y" rolloff="0.10"/> - <particles base="splash.xml" condition="drive skid"/> + <particles base="splash.xml" condition=" drive skid"/> </material> <material name="trail_diff.png" compositing="blend" disable-z-write="Y"/> <material name="tree_1.png" backface-culling="N" compositing="blend" disable-z-write="Y" graphical-effect="grass"/> Modified: main/trunk/data/tracks/lighthouse/quads.xml =================================================================== --- main/trunk/data/tracks/lighthouse/quads.xml 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/tracks/lighthouse/quads.xml 2013-10-27 23:06:54 UTC (rev 14324) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 12720 --> +<!-- Generated with script from SVN rev 13687 --> <quads> <!-- Driveline: BezierCurve.001 --> <quad p0="18.928 -13.361 -45.780" p1="19.085 -13.361 -57.124" p2="33.746 -13.807 -56.722" p3="33.290 -13.807 -45.385"/> Modified: main/trunk/data/tracks/lighthouse/scene.xml =================================================================== --- main/trunk/data/tracks/lighthouse/scene.xml 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/tracks/lighthouse/scene.xml 2013-10-27 23:06:54 UTC (rev 14324) @@ -1,105 +1,105 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 12720 --> +<!-- Generated with script from SVN rev 13687 --> <scene> - <track model="lighthouse-terrain_track.b3d" x="0" y="0" z="0"> - <static-object model="vineUnderCave.b3d" xyz="-86.86 -17.34 -87.70" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object model="bigTerrainChunk.b3d" xyz="220.85 16.34 -41.59" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="70.0" lod_group="pine_tree_lod" model="pine_tree_lod_hight.b3d" xyz="270.46 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> <!-- writeStaticObjects 3 --> - <static-object model="lightWindows.b3d" xyz="-158.20 55.48 -63.22" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="102.39 -11.20 -15.52" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-96.85 -8.65 -29.26" hpr="0.0 -0.0 0.0" scale="2.71 2.71 2.71"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="150.0" lod_group="pine_tree_lod" model="pine_tree_lod_medium.b3d" xyz="293.33 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="300.0" lod_group="pine_tree_lod" model="pine_tree_lod_low.b3d" xyz="309.45 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-47.61 -12.51 33.26" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -8.10 -4.66" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -6.11 16.29" hpr="0.0 30.7 0.0" scale="3.17 3.17 3.17"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="66.09 -11.20 -92.83" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="116.99 -11.20 -5.45" hpr="0.0 21.7 0.0" scale="1.81 1.81 1.81"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="117.67 -11.20 -33.35" hpr="0.0 -77.7 0.0" scale="2.38 2.38 2.38"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-117.71 -6.11 30.54" hpr="0.0 -75.4 0.0" scale="3.17 3.17 3.17"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-97.58 -11.46 36.36" hpr="-0.0 -106.1 -0.0" scale="2.29 2.29 2.29"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-77.01 -11.87 36.36" hpr="-0.0 -106.1 -0.0" scale="2.68 2.68 2.68"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="150.0" lod_group="miniLamp" model="miniLampPost_low.b3d" xyz="-156.19 3.73 -49.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="60.0" lod_group="grass_chunk" model="grass_chunk_hight.b3d" xyz="266.88 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="100.0" lod_group="grass_chunk" model="grass_chunk_low.b3d" xyz="266.88 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="99.38 -16.17 -18.46" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="106.39 -15.64 -18.46" hpr="-0.0 -0.0 0.5" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="102.42 -16.06 -12.81" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.30 -14.44 -25.77" hpr="19.0 -0.6 1.9" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.63 -14.41 -33.94" hpr="-9.9 0.3 1.9" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-101.33 -14.32 -29.38" hpr="-2.8 -2.3 12.3" scale="0.71 0.71 0.71"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.11 -17.10 30.07" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-44.92 -17.10 28.91" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-52.93 -17.10 33.59" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.30 -17.10 33.77" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> <!-- writeStaticObjects 3 --> - <static-object model="dynamicSky.b3d" xyz="-45.36 251.46 102.38" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"> <!-- writeStaticObjects 2 --> + <track model="lighthouse_track.b3d" x="0" y="0" z="0"> + <static-object model="vineUnderCave.b3d" xyz="-86.86 -17.34 -87.70" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object model="bigTerrainChunk.b3d" xyz="220.85 16.34 -41.59" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_distance="70.0" lod_group="pine_tree_lod" model="pine_tree_lod_hight.b3d" xyz="270.46 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> + <static-object model="lightWindows.b3d" xyz="-158.20 55.48 -63.22" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="102.39 -11.20 -15.52" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-96.85 -8.65 -29.26" hpr="0.0 -0.0 0.0" scale="2.71 2.71 2.71"/> + <static-object lod_distance="150.0" lod_group="pine_tree_lod" model="pine_tree_lod_medium.b3d" xyz="293.33 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_distance="300.0" lod_group="pine_tree_lod" model="pine_tree_lod_low.b3d" xyz="309.45 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-47.61 -12.51 33.26" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -8.10 -4.66" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -6.11 16.29" hpr="0.0 30.7 0.0" scale="3.17 3.17 3.17"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="66.09 -11.20 -92.83" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="116.99 -11.20 -5.45" hpr="0.0 21.7 0.0" scale="1.81 1.81 1.81"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="117.67 -11.20 -33.35" hpr="0.0 -77.7 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-117.71 -6.11 30.54" hpr="0.0 -75.4 0.0" scale="3.17 3.17 3.17"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-97.58 -11.46 36.36" hpr="-0.0 -106.1 -0.0" scale="2.29 2.29 2.29"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-77.01 -11.87 36.36" hpr="-0.0 -106.1 -0.0" scale="2.68 2.68 2.68"/> + <static-object lod_distance="150.0" lod_group="miniLamp" model="miniLampPost_low.b3d" xyz="-156.19 3.73 -49.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_distance="60.0" lod_group="grass_chunk" model="grass_chunk_hight.b3d" xyz="266.88 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_distance="100.0" lod_group="grass_chunk" model="grass_chunk_low.b3d" xyz="266.88 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="99.38 -16.17 -18.46" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="106.39 -15.64 -18.46" hpr="-0.0 -0.0 0.5" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="102.42 -16.06 -12.81" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.30 -14.44 -25.77" hpr="19.0 -0.6 1.9" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.63 -14.41 -33.94" hpr="-9.9 0.3 1.9" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-101.33 -14.32 -29.38" hpr="-2.8 -2.3 12.3" scale="0.71 0.71 0.71"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.11 -17.10 30.07" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-44.92 -17.10 28.91" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-52.93 -17.10 33.59" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.30 -17.10 33.77" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> + <static-object model="dynamicSky.b3d" xyz="-45.36 251.46 102.38" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"> <animated-texture name="dynamic_clouds.png" dx="0.050" dy="0.010" /> </static-object> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 3.24" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 -6.38" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="9.45 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-4.79 -17.10 -1.93" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-1.28 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="5.77 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-35.87 -13.28 -72.96" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.04 -13.28 -66.25" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-36.40 -13.28 -62.03" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.74 -13.28 -76.46" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.39 -13.28 -70.38" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-29.23 -12.41 -67.42" hpr="-12.5 69.5 -10.2" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="68.79 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="61.74 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="58.23 -16.13 -101.76" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="72.47 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="65.56 -16.13 -106.22" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-98.79 -14.44 -26.73" hpr="19.0 -0.6 1.9" scale="0.69 0.69 0.69"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.18 -13.28 -55.66" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.30 -13.28 -62.75" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.07 -13.28 -49.63" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-53.69 -13.28 -52.34" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-55.41 -13.28 -59.18" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-45.19 -13.28 -45.86" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-39.14 -13.28 -42.24" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.66 -13.28 -42.88" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-48.35 -13.28 -47.75" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.25 -13.28 -42.83" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 10.45" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 16.90" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.07 -17.10 20.51" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-71.81 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-81.44 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-78.62 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-73.43 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.78 -16.13 -96.45" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="34.45 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="45.01 -16.13 -94.85" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="22.40 -16.13 -94.19" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="11.84 -15.13 -91.34" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="19.17 -16.13 -95.80" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="28.12 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-59.95 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-65.14 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-67.96 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-58.33 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-80.17 -17.10 25.87" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-83.43 -17.10 21.68" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-87.82 -17.10 20.63" hpr="-3.6 11.1 -3.6" scale="0.85 0.85 0.85"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="100.0" lod_group="death_grass_chunk" model="death_grass_chunk_low.b3d" xyz="274.55 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_distance="60.0" lod_group="death_grass_chunk" model="death_grass_chunk_hight.b3d" xyz="274.55 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-6.19 -22.85 -153.19" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-11.07 -22.85 -153.19" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-17.97 -23.13 -147.41" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-13.09 -22.85 -147.41" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-2.75 -23.39 -185.87" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-7.64 -23.67 -185.87" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-0.74 -23.39 -191.65" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="4.15 -23.39 -191.65" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-64.86 -29.25 -118.96" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-69.33 -29.25 -117.00" hpr="0.0 -13.7 0.0" scale="1.16 1.16 1.16"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-73.34 -29.53 -108.94" hpr="3.5 -14.3 4.9" scale="1.16 1.16 1.16"/> <!-- writeStaticObjects 3 --> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-68.86 -29.25 -110.89" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 3.24" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 -6.38" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="9.45 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-4.79 -17.10 -1.93" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-1.28 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="5.77 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-35.87 -13.28 -72.96" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.04 -13.28 -66.25" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-36.40 -13.28 -62.03" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.74 -13.28 -76.46" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.39 -13.28 -70.38" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-29.23 -12.41 -67.42" hpr="-12.5 69.5 -10.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="68.79 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="61.74 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="58.23 -16.13 -101.76" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="72.47 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="65.56 -16.13 -106.22" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-98.79 -14.44 -26.73" hpr="19.0 -0.6 1.9" scale="0.69 0.69 0.69"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.18 -13.28 -55.66" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.30 -13.28 -62.75" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.07 -13.28 -49.63" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-53.69 -13.28 -52.34" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-55.41 -13.28 -59.18" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-45.19 -13.28 -45.86" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-39.14 -13.28 -42.24" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.66 -13.28 -42.88" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-48.35 -13.28 -47.75" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.25 -13.28 -42.83" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 10.45" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 16.90" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.07 -17.10 20.51" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-71.81 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-81.44 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-78.62 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-73.43 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.78 -16.13 -96.45" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="34.45 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="45.01 -16.13 -94.85" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="22.40 -16.13 -94.19" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="11.84 -15.13 -91.34" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="19.17 -16.13 -95.80" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="28.12 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-59.95 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-65.14 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-67.96 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-58.33 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-80.17 -17.10 25.87" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-83.43 -17.10 21.68" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-87.82 -17.10 20.63" hpr="-3.6 11.1 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_distance="100.0" lod_group="death_grass_chunk" model="death_grass_chunk_low.b3d" xyz="274.55 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_distance="60.0" lod_group="death_grass_chunk" model="death_grass_chunk_hight.b3d" xyz="274.55 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-6.19 -22.85 -153.19" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-11.07 -22.85 -153.19" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-17.97 -23.13 -147.41" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-13.09 -22.85 -147.41" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-2.75 -23.39 -185.87" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-7.64 -23.67 -185.87" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-0.74 -23.39 -191.65" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="4.15 -23.39 -191.65" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-64.86 -29.25 -118.96" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-69.33 -29.25 -117.00" hpr="0.0 -13.7 0.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-73.34 -29.53 -108.94" hpr="3.5 -14.3 4.9" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-68.86 -29.25 -110.89" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> </track> - <object type="animation" model="lightBeam.b3d" xyz="-148.25 18.15 -63.18" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-148.25 18.15 -63.18" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="lightBeam.b3d"> <curve channel="RotX" interpolation="linear" extend="cyclic"> <p c="1.000 -0.000"/> <p c="200.000 -0.000"/> @@ -115,7 +115,7 @@ <p c="200.000 358.200"/> </curve> </object> - <object type="animation" model="buoy.b3d" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> <curve channel="RotX" interpolation="bezier" extend="cyclic"> <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> @@ -132,7 +132,7 @@ <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> </curve> </object> - <object type="animation" model="buoy_halo.b3d" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> <curve channel="RotX" interpolation="bezier" extend="cyclic"> <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> @@ -149,7 +149,7 @@ <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> </curve> </object> - <object type="animation" model="buoy_halo.b3d" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> <curve channel="RotX" interpolation="bezier" extend="cyclic"> <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> @@ -166,7 +166,7 @@ <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> </curve> </object> - <object type="animation" model="buoy.b3d" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> <curve channel="RotX" interpolation="bezier" extend="cyclic"> <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> @@ -183,7 +183,7 @@ <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> </curve> </object> - <object type="animation" model="buoy.b3d" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> <curve channel="RotX" interpolation="bezier" extend="cyclic"> <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> @@ -200,7 +200,7 @@ <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> </curve> </object> - <object type="animation" model="buoy_halo.b3d" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> <curve channel="RotX" interpolation="bezier" extend="cyclic"> <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> @@ -217,11 +217,11 @@ <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> </curve> </object> - <object type="animation" model="buoy_lantern.b3d" xyz="46.25 -16.96 15.70" hpr="-8.8 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="46.25 -16.96 15.70" hpr="-8.8 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_lantern.b3d"> </object> - <object type="animation" model="buoy_lantern.b3d" xyz="46.25 -16.99 17.96" hpr="0.0 -0.0 -0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="46.25 -16.99 17.96" hpr="0.0 -0.0 -0.0" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_lantern.b3d"> </object> - <object type="animation" model="fishing_buoy2.b3d" xyz="62.15 -6.98 -171.37" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="62.15 -6.98 -171.37" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy2.b3d"> <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> @@ -238,7 +238,7 @@ <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> </curve> </object> - <object type="animation" model="fishing_buoy.b3d" xyz="-45.55 -18.14 -170.41" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="-45.55 -18.14 -170.41" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy.b3d"> <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> @@ -255,7 +255,7 @@ <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> </curve> </object> - <object type="animation" model="fishing_buoy2.b3d" xyz="37.25 -5.07 13.25" hpr="0.0 25.5 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="37.25 -5.07 13.25" hpr="0.0 25.5 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy2.b3d"> <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> @@ -272,7 +272,7 @@ <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> </curve> </object> - <object type="animation" model="fishing_buoy.b3d" xyz="3.85 -7.86 -0.35" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost"> + <object type="animation" xyz="3.85 -7.86 -0.35" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy.b3d"> <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> @@ -289,20 +289,20 @@ <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> </curve> </object> - <object type="animation" xyz="-44.05 -14.11 -163.50" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" lod_instance="true" lod_group="miniLamp" interaction="ghost"> + <object type="animation" xyz="-44.05 -14.11 -163.50" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> </object> - <object type="animation" xyz="74.93 -6.67 -208.19" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" lod_instance="true" lod_group="miniLamp" interaction="ghost"> + <object type="animation" xyz="74.93 -6.67 -208.19" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> </object> - <object type="animation" xyz="29.20 -5.27 9.43" hpr="-0.0 90.0 0.0" scale="1.00 1.00 1.00" lod_instance="true" lod_group="miniLamp" interaction="ghost"> + <object type="animation" xyz="29.20 -5.27 9.43" hpr="-0.0 90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> </object> - <object type="animation" xyz="-127.19 3.73 -63.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" lod_instance="true" lod_group="miniLamp" interaction="ghost"> + <object type="animation" xyz="-127.19 3.73 -63.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> </object> - <object type="animation" xyz="63.04 -9.51 -171.52" hpr="-0.0 -130.0 -0.0" scale="1.00 1.00 1.00" lod_instance="true" lod_group="miniLamp" interaction="ghost"> + <object type="animation" xyz="63.04 -9.51 -171.52" hpr="-0.0 -130.0 -0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> </object> <sun fog="true" fog-color="21 43 75" fog-start="20.00" fog-end="160.00"/> <sky-color rgb="77 104 255"/> <weather type="rain" /> - <sky-box texture="sky.jpg sky.jpg sky.jpg sky.jpg sky-m.jpg sky-m.jpg"/> + <sky-box texture="sky_top.jpg sky.jpg sky.jpg sky.jpg sky-m.jpg sky-m.jpg"/> <camera far="1000.0"/> <checks> <check-lap kind="lap" same-group="0" other-ids="1" /> Added: main/trunk/data/tracks/lighthouse/sky_top.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/lighthouse/sky_top.jpg =================================================================== --- main/trunk/data/tracks/lighthouse/sky_top.jpg 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/tracks/lighthouse/sky_top.jpg 2013-10-27 23:06:54 UTC (rev 14324) Property changes on: main/trunk/data/tracks/lighthouse/sky_top.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/jpeg \ No newline at end of property Modified: main/trunk/data/tracks/lighthouse/track.xml =================================================================== --- main/trunk/data/tracks/lighthouse/track.xml 2013-10-27 22:38:36 UTC (rev 14323) +++ main/trunk/data/tracks/lighthouse/track.xml 2013-10-27 23:06:54 UTC (rev 14324) @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!-- Generated with script from SVN rev 12720 --> -<track name = "Around The Lighthouse" +<!-- Generated with script from SVN rev 13687 --> +<track name = "Around the lighthouse" version = "5" groups = "standard" designer = "jean-manuel clemençon" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-10-27 23:35:02
|
Revision: 14328 http://sourceforge.net/p/supertuxkart/code/14328 Author: auria Date: 2013-10-27 23:34:58 +0000 (Sun, 27 Oct 2013) Log Message: ----------- Now that the nitro meter no longer features visible marks, adjust back the max nitro amount to what it was before, and restore back the old less easy nitro challenge on XR591 Modified Paths: -------------- main/trunk/data/challenges/xr591.challenge main/trunk/data/stk_config.xml Modified: main/trunk/data/challenges/xr591.challenge =================================================================== --- main/trunk/data/challenges/xr591.challenge 2013-10-27 23:23:57 UTC (rev 14327) +++ main/trunk/data/challenges/xr591.challenge 2013-10-27 23:34:58 UTC (rev 14328) @@ -6,11 +6,11 @@ <hard> <karts number="1"/> - <requirements energy="16" time="135"/> + <requirements energy="18" time="135"/> </hard> <medium> <karts number="1"/> - <requirements energy="14" time="155"/> + <requirements energy="15" time="155"/> </medium> <easy> <karts number="1"/> Modified: main/trunk/data/stk_config.xml =================================================================== --- main/trunk/data/stk_config.xml 2013-10-27 23:23:57 UTC (rev 14327) +++ main/trunk/data/stk_config.xml 2013-10-27 23:34:58 UTC (rev 14328) @@ -185,7 +185,7 @@ max: How much nitro a kart can store. --> <nitro engine-force="500" consumption="1" small-container="1" big-container="3" - max-speed-increase="5" duration="1" fade-out-time="2" max="16"/> + max-speed-increase="5" duration="1" fade-out-time="2" max="20"/> <!-- Bubble gum data: time: How long the bubblegum lasts. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2013-10-28 10:03:19
|
Revision: 14320 http://sourceforge.net/p/supertuxkart/code/14320 Author: hikerstk Date: 2013-10-28 10:03:16 +0000 (Mon, 28 Oct 2013) Log Message: ----------- Repository recovery 8: former r14328 Now that the nitro meter no longer features visible marks, adjust back the max nitro amount to what it was before, and restore back the old less easy nitro challenge on XR591 Revision Links: -------------- http://sourceforge.net/p/supertuxkart/code/14328 Modified Paths: -------------- main/trunk/data/challenges/xr591.challenge main/trunk/data/stk_config.xml Modified: main/trunk/data/challenges/xr591.challenge =================================================================== --- main/trunk/data/challenges/xr591.challenge 2013-10-28 10:00:58 UTC (rev 14319) +++ main/trunk/data/challenges/xr591.challenge 2013-10-28 10:03:16 UTC (rev 14320) @@ -6,11 +6,11 @@ <hard> <karts number="1"/> - <requirements energy="16" time="135"/> + <requirements energy="18" time="135"/> </hard> <medium> <karts number="1"/> - <requirements energy="14" time="155"/> + <requirements energy="15" time="155"/> </medium> <easy> <karts number="1"/> Modified: main/trunk/data/stk_config.xml =================================================================== --- main/trunk/data/stk_config.xml 2013-10-28 10:00:58 UTC (rev 14319) +++ main/trunk/data/stk_config.xml 2013-10-28 10:03:16 UTC (rev 14320) @@ -185,7 +185,7 @@ max: How much nitro a kart can store. --> <nitro engine-force="500" consumption="1" small-container="1" big-container="3" - max-speed-increase="5" duration="1" fade-out-time="2" max="16"/> + max-speed-increase="5" duration="1" fade-out-time="2" max="20"/> <!-- Bubble gum data: time: How long the bubblegum lasts. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2013-10-29 17:41:05
|
Revision: 14343 http://sourceforge.net/p/supertuxkart/code/14343 Author: deveee Date: 2013-10-29 17:41:01 +0000 (Tue, 29 Oct 2013) Log Message: ----------- Remove executable parameter in data files Modified Paths: -------------- main/trunk/data/karts/sara/Skin2.png main/trunk/data/karts/sara/darkblueMetal.png main/trunk/data/karts/sara/hair.png main/trunk/data/karts/sara/leatherShoes.png main/trunk/data/karts/sara/pix.png main/trunk/data/karts/sara/sara-shadow.png main/trunk/data/karts/sara/saraEyes.png main/trunk/data/karts/sara/saraSkin.png main/trunk/data/karts/sara/shoeHeel.png main/trunk/data/karts/sara/window.png main/trunk/data/tracks/subsea/easter_eggs.xml main/trunk/data/tracks/subsea/sea.b3d main/trunk/data/tracks/zengarden/JapanwoodBridge.jpg main/trunk/data/tracks/zengarden/black_rockMountain.jpg main/trunk/data/tracks/zengarden/bugslight.png main/trunk/data/tracks/zengarden/dynamic_clouds.png main/trunk/data/tracks/zengarden/haloStoneLantern.png main/trunk/data/tracks/zengarden/japanRedWood.png main/trunk/data/tracks/zengarden/lantern_light.png main/trunk/data/tracks/zengarden/rockMountain.jpg main/trunk/data/tracks/zengarden/rockTograss.jpg main/trunk/data/tracks/zengarden/sakura_leaves.jpg main/trunk/data/tracks/zengarden/sunset.png main/trunk/data/tracks/zengarden/to_black_rockMountain.jpg main/trunk/data/tracks/zengarden/tree_1.png main/trunk/data/tracks/zengarden/tree_zen.jpg main/trunk/data/tracks/zengarden/vegetation_1.png main/trunk/data/tracks/zengarden/waterparticles.png main/trunk/data/tracks/zengarden/wood_planks1.jpg main/trunk/data/tracks/zengarden/wooden.png main/trunk/data/tracks/zengarden/wooden2.png Property Changed: ---------------- main/trunk/data/karts/sara/Skin2.png main/trunk/data/karts/sara/darkblueMetal.png main/trunk/data/karts/sara/hair.png main/trunk/data/karts/sara/leatherShoes.png main/trunk/data/karts/sara/pix.png main/trunk/data/karts/sara/sara-shadow.png main/trunk/data/karts/sara/saraEyes.png main/trunk/data/karts/sara/saraSkin.png main/trunk/data/karts/sara/shoeHeel.png main/trunk/data/karts/sara/window.png main/trunk/data/tracks/subsea/easter_eggs.xml main/trunk/data/tracks/subsea/sea.b3d main/trunk/data/tracks/zengarden/JapanwoodBridge.jpg main/trunk/data/tracks/zengarden/black_rockMountain.jpg main/trunk/data/tracks/zengarden/bugslight.png main/trunk/data/tracks/zengarden/dynamic_clouds.png main/trunk/data/tracks/zengarden/haloStoneLantern.png main/trunk/data/tracks/zengarden/japanRedWood.png main/trunk/data/tracks/zengarden/lantern_light.png main/trunk/data/tracks/zengarden/rockMountain.jpg main/trunk/data/tracks/zengarden/rockTograss.jpg main/trunk/data/tracks/zengarden/sakura_leaves.jpg main/trunk/data/tracks/zengarden/sunset.png main/trunk/data/tracks/zengarden/to_black_rockMountain.jpg main/trunk/data/tracks/zengarden/tree_1.png main/trunk/data/tracks/zengarden/tree_zen.jpg main/trunk/data/tracks/zengarden/vegetation_1.png main/trunk/data/tracks/zengarden/waterparticles.png main/trunk/data/tracks/zengarden/wood_planks1.jpg main/trunk/data/tracks/zengarden/wooden.png main/trunk/data/tracks/zengarden/wooden2.png Modified: main/trunk/data/karts/sara/Skin2.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/Skin2.png =================================================================== --- main/trunk/data/karts/sara/Skin2.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/Skin2.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/Skin2.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/darkblueMetal.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/darkblueMetal.png =================================================================== --- main/trunk/data/karts/sara/darkblueMetal.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/darkblueMetal.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/darkblueMetal.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/hair.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/hair.png =================================================================== --- main/trunk/data/karts/sara/hair.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/hair.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/hair.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/leatherShoes.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/leatherShoes.png =================================================================== --- main/trunk/data/karts/sara/leatherShoes.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/leatherShoes.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/leatherShoes.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/pix.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/pix.png =================================================================== --- main/trunk/data/karts/sara/pix.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/pix.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/pix.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/sara-shadow.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/sara-shadow.png =================================================================== --- main/trunk/data/karts/sara/sara-shadow.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/sara-shadow.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/sara-shadow.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/saraEyes.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/saraEyes.png =================================================================== --- main/trunk/data/karts/sara/saraEyes.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/saraEyes.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/saraEyes.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/saraSkin.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/saraSkin.png =================================================================== --- main/trunk/data/karts/sara/saraSkin.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/saraSkin.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/saraSkin.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/shoeHeel.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/shoeHeel.png =================================================================== --- main/trunk/data/karts/sara/shoeHeel.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/shoeHeel.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/shoeHeel.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/karts/sara/window.png =================================================================== (Binary files differ) Index: main/trunk/data/karts/sara/window.png =================================================================== --- main/trunk/data/karts/sara/window.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/karts/sara/window.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/karts/sara/window.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Index: main/trunk/data/tracks/subsea/easter_eggs.xml =================================================================== --- main/trunk/data/tracks/subsea/easter_eggs.xml 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/subsea/easter_eggs.xml 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/subsea/easter_eggs.xml ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/subsea/sea.b3d =================================================================== (Binary files differ) Index: main/trunk/data/tracks/subsea/sea.b3d =================================================================== --- main/trunk/data/tracks/subsea/sea.b3d 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/subsea/sea.b3d 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/subsea/sea.b3d ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/JapanwoodBridge.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/JapanwoodBridge.jpg =================================================================== --- main/trunk/data/tracks/zengarden/JapanwoodBridge.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/JapanwoodBridge.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/JapanwoodBridge.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/black_rockMountain.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/black_rockMountain.jpg =================================================================== --- main/trunk/data/tracks/zengarden/black_rockMountain.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/black_rockMountain.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/black_rockMountain.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/bugslight.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/bugslight.png =================================================================== --- main/trunk/data/tracks/zengarden/bugslight.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/bugslight.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/bugslight.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/dynamic_clouds.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/dynamic_clouds.png =================================================================== --- main/trunk/data/tracks/zengarden/dynamic_clouds.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/dynamic_clouds.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/dynamic_clouds.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/haloStoneLantern.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/haloStoneLantern.png =================================================================== --- main/trunk/data/tracks/zengarden/haloStoneLantern.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/haloStoneLantern.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/haloStoneLantern.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/japanRedWood.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/japanRedWood.png =================================================================== --- main/trunk/data/tracks/zengarden/japanRedWood.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/japanRedWood.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/japanRedWood.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/lantern_light.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/lantern_light.png =================================================================== --- main/trunk/data/tracks/zengarden/lantern_light.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/lantern_light.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/lantern_light.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/rockMountain.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/rockMountain.jpg =================================================================== --- main/trunk/data/tracks/zengarden/rockMountain.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/rockMountain.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/rockMountain.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/rockTograss.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/rockTograss.jpg =================================================================== --- main/trunk/data/tracks/zengarden/rockTograss.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/rockTograss.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/rockTograss.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/sakura_leaves.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/sakura_leaves.jpg =================================================================== --- main/trunk/data/tracks/zengarden/sakura_leaves.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/sakura_leaves.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/sakura_leaves.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/sunset.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/sunset.png =================================================================== --- main/trunk/data/tracks/zengarden/sunset.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/sunset.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/sunset.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/to_black_rockMountain.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/to_black_rockMountain.jpg =================================================================== --- main/trunk/data/tracks/zengarden/to_black_rockMountain.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/to_black_rockMountain.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/to_black_rockMountain.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/tree_1.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/tree_1.png =================================================================== --- main/trunk/data/tracks/zengarden/tree_1.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/tree_1.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/tree_1.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/tree_zen.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/tree_zen.jpg =================================================================== --- main/trunk/data/tracks/zengarden/tree_zen.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/tree_zen.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/tree_zen.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/vegetation_1.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/vegetation_1.png =================================================================== --- main/trunk/data/tracks/zengarden/vegetation_1.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/vegetation_1.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/vegetation_1.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/waterparticles.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/waterparticles.png =================================================================== --- main/trunk/data/tracks/zengarden/waterparticles.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/waterparticles.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/waterparticles.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/wood_planks1.jpg =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/wood_planks1.jpg =================================================================== --- main/trunk/data/tracks/zengarden/wood_planks1.jpg 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/wood_planks1.jpg 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/wood_planks1.jpg ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/wooden.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/wooden.png =================================================================== --- main/trunk/data/tracks/zengarden/wooden.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/wooden.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/wooden.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Modified: main/trunk/data/tracks/zengarden/wooden2.png =================================================================== (Binary files differ) Index: main/trunk/data/tracks/zengarden/wooden2.png =================================================================== --- main/trunk/data/tracks/zengarden/wooden2.png 2013-10-29 07:38:34 UTC (rev 14342) +++ main/trunk/data/tracks/zengarden/wooden2.png 2013-10-29 17:41:01 UTC (rev 14343) Property changes on: main/trunk/data/tracks/zengarden/wooden2.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2013-10-30 02:59:47
|
Revision: 14347 http://sourceforge.net/p/supertuxkart/code/14347 Author: hikerstk Date: 2013-10-30 02:59:43 +0000 (Wed, 30 Oct 2013) Log Message: ----------- Fixed typo in string, updated pot file. Modified Paths: -------------- main/trunk/data/gui/help3.stkgui main/trunk/data/po/supertuxkart.pot Modified: main/trunk/data/gui/help3.stkgui =================================================================== --- main/trunk/data/gui/help3.stkgui 2013-10-30 01:07:08 UTC (rev 14346) +++ main/trunk/data/gui/help3.stkgui 2013-10-30 02:59:43 UTC (rev 14347) @@ -65,7 +65,7 @@ -+ Modified: main/trunk/data/po/supertuxkart.pot =================================================================== --- main/trunk/data/po/supertuxkart.pot 2013-10-30 01:07:08 UTC (rev 14346) +++ main/trunk/data/po/supertuxkart.pot 2013-10-30 02:59:43 UTC (rev 14347) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: supertuxkart\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-29 19:58-0400\n" +"POT-Creation-Date: 2013-10-30 13:57+1100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -26,7 +26,7 @@ #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:98 data/po/gui_strings.h:101 +#: data/po/gui_strings.h:104 data/po/gui_strings.h:107 msgid "" " But you pathetic little twerps will never be able to beat me - King of the " "Karts!" @@ -107,7 +107,7 @@ #. I18N: ./data/gui/track_info_dialog.stkgui #. I18N: In the track setup screen (number of laps choice, where %i is the number) -#: data/po/gui_strings.h:133 +#: data/po/gui_strings.h:322 #, c-format msgid "%i laps" msgstr "" @@ -199,13 +199,13 @@ #. I18N: for empty highscores entries #. I18N: ./data/gui/track_info_dialog.stkgui #: src/states_screens/dialogs/track_info_dialog.cpp:226 -#: data/po/gui_strings.h:119 data/po/gui_strings.h:122 -#: data/po/gui_strings.h:125 +#: data/po/gui_strings.h:308 data/po/gui_strings.h:311 +#: data/po/gui_strings.h:314 msgid "(Empty)" msgstr "" #. I18N: ./data/gui/help4.stkgui -#: data/po/gui_strings.h:312 +#: data/po/gui_strings.h:247 msgid "(network play is not yet available)" msgstr "" @@ -215,13 +215,13 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: in the help screen -#: data/po/gui_strings.h:779 +#: data/po/gui_strings.h:652 msgid "* Current key bindings can be seen/changed in menu Options" msgstr "" #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:488 +#: data/po/gui_strings.h:766 msgid "" "* Most of these game modes can also be played in a Grand Prix fashion: " "instead of playing a single race, you play many in a row. The better you " @@ -230,7 +230,7 @@ msgstr "" #. I18N: ./data/gui/options_input.stkgui -#: data/po/gui_strings.h:592 +#: data/po/gui_strings.h:222 msgid "" "* Which config to use will be inferred from which 'fire' key is pressed to " "join the game." @@ -263,7 +263,7 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:476 +#: data/po/gui_strings.h:754 msgid "" "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until " "they lose all their lives." @@ -282,7 +282,7 @@ msgstr "" #. I18N: ./data/gui/track_info_dialog.stkgui -#: data/po/gui_strings.h:116 +#: data/po/gui_strings.h:305 msgid "= Highscores =" msgstr "" @@ -296,7 +296,7 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:710 +#: data/po/gui_strings.h:552 msgid "About" msgstr "" @@ -324,7 +324,7 @@ #. I18N: ./data/gui/options_players.stkgui #. I18N: In players configuration menu -#: data/po/gui_strings.h:518 +#: data/po/gui_strings.h:520 msgid "Add Player" msgstr "" @@ -335,18 +335,18 @@ #. I18N: ./data/gui/options_input.stkgui #. I18N: In the input configuration screen -#: data/po/gui_strings.h:589 +#: data/po/gui_strings.h:219 msgid "Add a device" msgstr "" +#. I18N: arena group name #. I18N: track group name #. I18N: kart group name -#. I18N: arena group name #. I18N: ./data/gui/arenas.stkgui #. I18N: track group +#: src/states_screens/arenas_screen.cpp:81 #: src/states_screens/tracks_screen.cpp:176 -#: src/states_screens/kart_selection.cpp:1042 -#: src/states_screens/arenas_screen.cpp:81 data/po/gui_strings.h:803 +#: src/states_screens/kart_selection.cpp:1042 data/po/gui_strings.h:591 msgid "Add-Ons" msgstr "" @@ -356,33 +356,33 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:694 +#: data/po/gui_strings.h:536 msgid "Addons" msgstr "" #. I18N: ./data/karts/adiumy/kart.xml -#: data/po/gui_strings.h:849 +#: data/po/gui_strings.h:873 msgid "Adiumy" msgstr "" +#. I18N: name of the tab that will show arenas from all groups #. I18N: name of the tab that will show tracks from all groups +#. I18N: Time filters for add-ons +#. I18N: name of the tab that will show tracks from all groups #. I18N: if all kart animations are enabled -#. I18N: name of the tab that will show tracks from all groups -#. I18N: Time filters for add-ons -#. I18N: name of the tab that will show arenas from all groups #. I18N: ./data/gui/arenas.stkgui #. I18N: track group +#: src/states_screens/arenas_screen.cpp:73 #: src/states_screens/tracks_screen.cpp:168 -#: src/states_screens/options_screen_video.cpp:353 +#: src/states_screens/addons_screen.cpp:46 #: src/states_screens/kart_selection.cpp:1034 -#: src/states_screens/addons_screen.cpp:46 -#: src/states_screens/arenas_screen.cpp:73 data/po/gui_strings.h:807 +#: src/states_screens/options_screen_video.cpp:353 data/po/gui_strings.h:595 msgid "All" msgstr "" #. I18N: ./data/gui/tracks.stkgui #. I18N: Section in track selection screen -#: data/po/gui_strings.h:733 +#: data/po/gui_strings.h:200 msgid "All Tracks" msgstr "" @@ -392,23 +392,23 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:674 +#: data/po/gui_strings.h:457 msgid "Allow STK to connect to the Internet" msgstr "" #. I18N: ./data/tracks/jungle/track.xml -#: data/po/gui_strings.h:2 +#: data/po/gui_strings.h:20 msgid "Amazonian Journey" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:177 +#: data/po/gui_strings.h:693 msgid "Anchor - slows down greatly the kart in the first position." msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:232 +#: data/po/gui_strings.h:419 msgid "Animated Characters" msgstr "" @@ -420,7 +420,7 @@ #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:224 +#: data/po/gui_strings.h:411 msgid "Animated Scenery" msgstr "" @@ -432,7 +432,7 @@ #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:240 +#: data/po/gui_strings.h:427 msgid "Anti-aliasing (requires restart)" msgstr "" @@ -444,7 +444,7 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings menu -#: data/po/gui_strings.h:401 +#: data/po/gui_strings.h:302 msgid "Apply new resolution" msgstr "" @@ -457,12 +457,12 @@ #. I18N: Section in the addons menu #. I18N: ./data/gui/arenas.stkgui #. I18N: Section in arena tracks selection screen -#: data/po/gui_strings.h:618 data/po/gui_strings.h:795 +#: data/po/gui_strings.h:579 data/po/gui_strings.h:583 msgid "Arenas" msgstr "" #. I18N: ./data/tracks/lighthouse/track.xml -#: data/po/gui_strings.h:8 +#: data/po/gui_strings.h:50 msgid "Around the lighthouse" msgstr "" @@ -474,28 +474,28 @@ #. I18N: ./data/gui/press_a_key_dialog.stkgui #. I18N: When configuring input -#: data/po/gui_strings.h:721 +#: data/po/gui_strings.h:468 msgid "Assign to ESC key" msgstr "" #. I18N: ./data/grandprix/4_atworldsend.grandprix -#: data/po/gui_strings.h:104 data/po/gui_strings.h:810 +#: data/po/gui_strings.h:116 data/po/gui_strings.h:822 msgid "At World's End" msgstr "" #. I18N: ./data/gui/options_audio.stkgui #. I18N: Section in the settings menu +#: src/states_screens/options_screen_input2.cpp:71 #: src/states_screens/options_screen_input.cpp:138 -#: src/states_screens/options_screen_input2.cpp:71 -#: src/states_screens/options_screen_video.cpp:87 +#: src/states_screens/options_screen_players.cpp:71 #: src/states_screens/options_screen_ui.cpp:112 -#: src/states_screens/options_screen_players.cpp:71 data/po/gui_strings.h:338 +#: src/states_screens/options_screen_video.cpp:87 data/po/gui_strings.h:145 msgid "Audio" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: src/tracks/track_object_presentation.cpp:618 data/po/gui_strings.h:763 +#: src/tracks/track_object_presentation.cpp:618 data/po/gui_strings.h:636 msgid "Avoid bananas!" msgstr "" @@ -519,19 +519,19 @@ #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-ons screen action -#: src/states_screens/dialogs/addons_loading.cpp:260 data/po/gui_strings.h:791 +#: src/states_screens/dialogs/addons_loading.cpp:260 data/po/gui_strings.h:192 msgid "Back" msgstr "" #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:525 +#: data/po/gui_strings.h:482 msgid "Back to Game" msgstr "" #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:628 +#: data/po/gui_strings.h:332 msgid "Back to Race" msgstr "" @@ -541,13 +541,13 @@ #. I18N: ./data/gui/options_device.stkgui #. I18N: In the input configuration screen -#: data/po/gui_strings.h:438 +#: data/po/gui_strings.h:404 msgid "Back to device list" msgstr "" #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:541 +#: data/po/gui_strings.h:498 msgid "Back to menu" msgstr "" @@ -560,24 +560,24 @@ msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:183 +#: data/po/gui_strings.h:699 msgid "" "Basket Ball - bounces after the leader, and might squash and slow down karts " "down on the way." msgstr "" #. I18N: ./data/tracks/battleisland/track.xml -#: data/po/gui_strings.h:26 +#: data/po/gui_strings.h:29 msgid "Battle Island" msgstr "" #. I18N: ./data/karts/beagle/kart.xml -#: data/po/gui_strings.h:822 +#: data/po/gui_strings.h:843 msgid "Beagle" msgstr "" #. I18N: ./data/karts/beastie/kart.xml -#: data/po/gui_strings.h:837 +#: data/po/gui_strings.h:855 msgid "Beastie" msgstr "" @@ -587,7 +587,7 @@ msgstr "" #. I18N: ./data/tracks/mansion/track.xml -#: data/po/gui_strings.h:44 +#: data/po/gui_strings.h:35 msgid "Blackhill Mansion" msgstr "" @@ -595,13 +595,14 @@ msgid "Blue Team Wins" msgstr "" +#. I18N: ./data/tracks/farm.new/track.xml #. I18N: ./data/tracks/farm/track.xml -#: data/po/gui_strings.h:56 +#: data/po/gui_strings.h:23 data/po/gui_strings.h:44 msgid "Bovine Barnyard" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:171 +#: data/po/gui_strings.h:687 msgid "" "Bowling Ball - bounces off walls. If you are looking back, it will be thrown " "backwards." @@ -613,7 +614,7 @@ msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:162 +#: data/po/gui_strings.h:678 msgid "" "BubbleGum - protect yourself with a shield, or use while looking back to " "leave a sticky pink puddle behind you." @@ -621,17 +622,17 @@ #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:86 data/po/gui_strings.h:89 +#: data/po/gui_strings.h:92 data/po/gui_strings.h:95 msgid "But I'm a fair creature, so I'll make you a deal." msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:165 +#: data/po/gui_strings.h:681 msgid "" "Cake - thrown at the closest rival, best on short ranges and long straights." msgstr "" -#: src/addons/news_manager.cpp:149 src/addons/network_http.cpp:432 +#: src/addons/network_http.cpp:432 src/addons/news_manager.cpp:149 msgid "Can't access stkaddons server..." msgstr "" @@ -645,13 +646,13 @@ #. I18N: ./data/gui/confirm_dialog.stkgui #. I18N: In a 'are you sure?' dialog +#. I18N: ./data/gui/story_mode_new.stkgui #. I18N: ./data/gui/confirm_resolution_dialog.stkgui #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton -#. I18N: ./data/gui/story_mode_new.stkgui #: src/states_screens/dialogs/add_device_dialog.cpp:128 #: src/states_screens/dialogs/player_info_dialog.cpp:106 -#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:213 -#: data/po/gui_strings.h:496 data/po/gui_strings.h:566 +#: src/states_screens/dialogs/addons_loading.cpp:226 data/po/gui_strings.h:263 +#: data/po/gui_strings.h:381 data/po/gui_strings.h:389 msgid "Cancel" msgstr "" @@ -671,7 +672,7 @@ msgstr "" #. I18N: ./data/tracks/cave/track.xml -#: data/po/gui_strings.h:23 +#: data/po/gui_strings.h:26 msgid "Cave X" msgstr "" @@ -685,29 +686,29 @@ #. I18N: ./data/gui/challenges.stkgui #. I18N: Title for challenges screen -#: data/po/gui_strings.h:324 +#: data/po/gui_strings.h:502 msgid "Challenges : Trophy Room" msgstr "" #. I18N: ./data/gui/karts.stkgui #. I18N: In the kart selection (player setup) screen -#: data/po/gui_strings.h:423 +#: data/po/gui_strings.h:606 msgid "Choose a Kart" msgstr "" #. I18N: ./data/gui/help1.stkgui -#: data/po/gui_strings.h:755 +#: data/po/gui_strings.h:628 msgid "Click here to play the tutorial" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui -#: data/po/gui_strings.h:251 +#: data/po/gui_strings.h:438 msgid "Close" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:759 +#: data/po/gui_strings.h:632 msgid "Collect blue boxes : they will give you weapons or other powerups" msgstr "" @@ -727,7 +728,7 @@ #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:767 +#: data/po/gui_strings.h:640 msgid "" "Collecting nitro allows you to get speed boosts whenever you wish by " "pressing the appropriate key. You can see your current level of nitro in the " @@ -755,28 +756,28 @@ msgid "Contains no powerups, so only your driving skills matter!" msgstr "" +#. I18N: ./data/gui/feature_unlocked.stkgui #. I18N: ./data/gui/tutorial_message_dialog.stkgui #. I18N: Button in tutorial +#. I18N: ./data/gui/grand_prix_win.stkgui +#. I18N: ./data/gui/grand_prix_lose.stkgui #. I18N: ./data/gui/soccer_setup.stkgui #. I18N: In soccer setup screen -#. I18N: ./data/gui/grand_prix_win.stkgui -#. I18N: ./data/gui/feature_unlocked.stkgui -#. I18N: ./data/gui/grand_prix_lose.stkgui -#: src/states_screens/race_result_gui.cpp:123 data/po/gui_strings.h:217 -#: data/po/gui_strings.h:419 data/po/gui_strings.h:595 -#: data/po/gui_strings.h:621 data/po/gui_strings.h:655 +#: src/states_screens/race_result_gui.cpp:123 data/po/gui_strings.h:180 +#: data/po/gui_strings.h:204 data/po/gui_strings.h:475 +#: data/po/gui_strings.h:795 data/po/gui_strings.h:813 msgid "Continue" msgstr "" +#. I18N: ./data/gui/options_input.stkgui +#. I18N: Section in the settings menu #. I18N: ./data/gui/options_device.stkgui #. I18N: Section in the settings menu -#. I18N: ./data/gui/options_input.stkgui -#. I18N: Section in the settings menu +#: src/states_screens/options_screen_players.cpp:73 +#: src/states_screens/options_screen_ui.cpp:114 #: src/states_screens/options_screen_audio.cpp:66 -#: src/states_screens/options_screen_video.cpp:90 -#: src/states_screens/options_screen_ui.cpp:114 -#: src/states_screens/options_screen_players.cpp:73 data/po/gui_strings.h:430 -#: data/po/gui_strings.h:581 +#: src/states_screens/options_screen_video.cpp:90 data/po/gui_strings.h:211 +#: data/po/gui_strings.h:396 msgid "Controls" msgstr "" @@ -786,13 +787,13 @@ #. I18N: ./data/gui/story_mode_lobby.stkgui #. I18N: In story mode 'select a game slot' menu -#: data/po/gui_strings.h:261 +#: data/po/gui_strings.h:712 msgid "Create a new player" msgstr "" #. I18N: ./data/gui/credits.stkgui #. I18N: Title in credits screen -#: data/po/gui_strings.h:500 +#: data/po/gui_strings.h:716 msgid "Credits" msgstr "" @@ -803,16 +804,21 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:377 +#: data/po/gui_strings.h:278 msgid "Custom settings..." msgstr "" #. I18N: ./data/gui/options_device.stkgui #. I18N: To delete a keyboard configuration -#: src/states_screens/options_screen_input2.cpp:96 data/po/gui_strings.h:434 +#: src/states_screens/options_screen_input2.cpp:96 data/po/gui_strings.h:400 msgid "Delete Configuration" msgstr "" +#. I18N: ./data/tracks/dp/track.xml +#: data/po/gui_strings.h:5 +msgid "Desert Point" +msgstr "" + #. I18N: button to disable a gamepad configuration #: src/states_screens/options_screen_input2.cpp:81 #: src/states_screens/options_screen_input2.cpp:516 @@ -821,15 +827,15 @@ #. I18N: in the graphical options tooltip; #. indicates a graphical feature is disabled -#: src/states_screens/options_screen_video.cpp:351 #: src/states_screens/dialogs/custom_video_settings.cpp:56 #: src/states_screens/dialogs/custom_video_settings.cpp:80 +#: src/states_screens/options_screen_video.cpp:351 msgid "Disabled" msgstr "" #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:670 +#: data/po/gui_strings.h:453 msgid "Display FPS" msgstr "" @@ -863,8 +869,8 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:484 -msgid "Egg hunt: Explore traks to find all hidden eggs." +#: data/po/gui_strings.h:762 +msgid "Egg hunt: Explore tracks to find all hidden eggs." msgstr "" #: src/modes/easter_egg_hunt.cpp:202 @@ -883,7 +889,7 @@ msgstr "" #. I18N: ./data/karts/emule/kart.xml -#: data/po/gui_strings.h:855 +#: data/po/gui_strings.h:846 msgid "Emule" msgstr "" @@ -897,8 +903,8 @@ #. indicates a graphical feature is enabled #. I18N: ./data/gui/options_audio.stkgui #. I18N: Next to checkbox in settings menu -#: src/states_screens/options_screen_video.cpp:348 data/po/gui_strings.h:346 -#: data/po/gui_strings.h:358 +#: src/states_screens/options_screen_video.cpp:348 data/po/gui_strings.h:153 +#: data/po/gui_strings.h:165 msgid "Enabled" msgstr "" @@ -909,7 +915,7 @@ #. I18N: ./data/gui/enter_player_name_dialog.stkgui #. I18N: In the 'add new player' dialog -#: data/po/gui_strings.h:570 +#: data/po/gui_strings.h:173 msgid "Enter the new player's name" msgstr "" @@ -921,18 +927,18 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:652 +#: data/po/gui_strings.h:356 msgid "Exit Race" msgstr "" #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Difficulty +#. I18N: ./data/gui/story_mode_new.stkgui +#. I18N: Difficulty #. I18N: ./data/gui/racesetup.stkgui #. I18N: Difficulty -#. I18N: ./data/gui/story_mode_new.stkgui -#. I18N: Difficulty -#: data/po/gui_strings.h:205 data/po/gui_strings.h:280 -#: data/po/gui_strings.h:560 +#: data/po/gui_strings.h:138 data/po/gui_strings.h:375 +#: data/po/gui_strings.h:785 msgid "Expert" msgstr "" @@ -957,7 +963,7 @@ #. I18N: ./data/gui/help4.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:316 +#: data/po/gui_strings.h:251 msgid "" "First, you will need several input devices (having multiple gamepads or " "joysticks is the best way to play with several people). Go in the input " @@ -978,7 +984,7 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:472 +#: data/po/gui_strings.h:750 msgid "" "Follow the leader: Run for second place, as the last kart will be " "disqualified every time the counter hits zero. Beware : going in front of " @@ -997,7 +1003,7 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:393 +#: data/po/gui_strings.h:294 msgid "Fullscreen" msgstr "" @@ -1011,16 +1017,16 @@ msgid "Game Keys" msgstr "" +#. I18N: ./data/gui/help4.stkgui +#. I18N: Tab in help menu +#. I18N: ./data/gui/help1.stkgui +#. I18N: Tab in help menu #. I18N: ./data/gui/help2.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help4.stkgui -#. I18N: Tab in help menu #. I18N: ./data/gui/help3.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help1.stkgui -#. I18N: Tab in help menu -#: data/po/gui_strings.h:151 data/po/gui_strings.h:302 -#: data/po/gui_strings.h:453 data/po/gui_strings.h:748 +#: data/po/gui_strings.h:237 data/po/gui_strings.h:621 +#: data/po/gui_strings.h:667 data/po/gui_strings.h:731 msgid "Game Modes" msgstr "" @@ -1036,16 +1042,16 @@ msgid "Gamepad hat %d" msgstr "" +#. I18N: ./data/gui/help4.stkgui +#. I18N: Tab in help menu +#. I18N: ./data/gui/help1.stkgui +#. I18N: Tab in help menu #. I18N: ./data/gui/help2.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help4.stkgui -#. I18N: Tab in help menu #. I18N: ./data/gui/help3.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help1.stkgui -#. I18N: Tab in help menu -#: data/po/gui_strings.h:143 data/po/gui_strings.h:294 -#: data/po/gui_strings.h:445 data/po/gui_strings.h:740 +#: data/po/gui_strings.h:229 data/po/gui_strings.h:613 +#: data/po/gui_strings.h:659 data/po/gui_strings.h:723 msgid "General" msgstr "" @@ -1055,12 +1061,12 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:640 +#: data/po/gui_strings.h:344 msgid "Give Up Race" msgstr "" #. I18N: ./data/karts/gnu/kart.xml -#: data/po/gui_strings.h:843 +#: data/po/gui_strings.h:834 msgid "Gnu" msgstr "" @@ -1072,7 +1078,7 @@ #. I18N: ./data/gui/tracks.stkgui #. I18N: Section in track selection screen #: src/states_screens/dialogs/select_challenge.cpp:140 -#: data/po/gui_strings.h:729 +#: data/po/gui_strings.h:196 msgid "Grand Prix" msgstr "" @@ -1082,27 +1088,27 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the graphics settings -#: data/po/gui_strings.h:373 +#: data/po/gui_strings.h:274 msgid "Graphical Effects Level" msgstr "" #. I18N: ./data/gui/options_video.stkgui #. I18N: Section in the settings menu +#: src/states_screens/options_screen_input2.cpp:70 #: src/states_screens/options_screen_input.cpp:137 -#: src/states_screens/options_screen_audio.cpp:63 -#: src/states_screens/options_screen_input2.cpp:70 +#: src/states_screens/options_screen_players.cpp:70 #: src/states_screens/options_screen_ui.cpp:111 -#: src/states_screens/options_screen_players.cpp:70 data/po/gui_strings.h:369 +#: src/states_screens/options_screen_audio.cpp:63 data/po/gui_strings.h:270 msgid "Graphics" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui -#: data/po/gui_strings.h:220 +#: data/po/gui_strings.h:407 msgid "Graphics Settings" msgstr "" #. I18N: ./data/tracks/greenvalley/track.xml -#: data/po/gui_strings.h:68 +#: data/po/gui_strings.h:11 msgid "Green Valley" msgstr "" @@ -1111,23 +1117,23 @@ msgstr "" #. I18N: ./data/tracks/hacienda/track.xml -#: data/po/gui_strings.h:29 +#: data/po/gui_strings.h:68 msgid "Hacienda" msgstr "" +#. I18N: ./data/gui/race_paused_dialog.stkgui +#. I18N: Race paused button #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#. I18N: ./data/gui/race_paused_dialog.stkgui -#. I18N: Race paused button #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:537 data/po/gui_strings.h:648 -#: data/po/gui_strings.h:702 +#: data/po/gui_strings.h:352 data/po/gui_strings.h:494 +#: data/po/gui_strings.h:544 msgid "Help" msgstr "" #. I18N: ./data/karts/hexley/kart.xml -#: data/po/gui_strings.h:828 +#: data/po/gui_strings.h:831 msgid "Hexley" msgstr "" @@ -1148,13 +1154,13 @@ #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:92 data/po/gui_strings.h:95 +#: data/po/gui_strings.h:98 data/po/gui_strings.h:101 msgid "If you can beat me at racing, I will free the old codger." msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:771 +#: data/po/gui_strings.h:644 msgid "" "If you see a button with a lock like this one, you need to complete a " "challenge to unlock it." @@ -1167,18 +1173,18 @@ #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-on screen action -#: data/po/gui_strings.h:783 +#: data/po/gui_strings.h:184 msgid "Install" msgstr "" #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Difficulty +#. I18N: ./data/gui/story_mode_new.stkgui +#. I18N: Difficulty #. I18N: ./data/gui/racesetup.stkgui #. I18N: Difficulty -#. I18N: ./data/gui/story_mode_new.stkgui -#. I18N: Difficulty -#: data/po/gui_strings.h:201 data/po/gui_strings.h:276 -#: data/po/gui_strings.h:556 +#: data/po/gui_strings.h:134 data/po/gui_strings.h:371 +#: data/po/gui_strings.h:781 msgid "Intermediate" msgstr "" @@ -1188,13 +1194,13 @@ #. I18N: ./data/gui/addons_screen.stkgui #. I18N: Section in the addons menu -#: data/po/gui_strings.h:610 +#: data/po/gui_strings.h:571 msgid "Karts" msgstr "" #. I18N: ./data/gui/confirm_resolution_dialog.stkgui #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton -#: data/po/gui_strings.h:492 +#: data/po/gui_strings.h:385 msgid "Keep this resolution" msgstr "" @@ -1209,13 +1215,13 @@ msgstr "" #. I18N: ./data/karts/konqi/kart.xml -#: data/po/gui_strings.h:846 +#: data/po/gui_strings.h:867 msgid "Konqi" msgstr "" #. I18N: Shown at the end of a race +#: src/states_screens/race_gui.cpp:103 #: src/states_screens/race_gui_overworld.cpp:106 -#: src/states_screens/race_gui.cpp:103 msgid "Lap" msgstr "" @@ -1247,13 +1253,13 @@ msgid "Locked" msgstr "" +#: src/states_screens/arenas_screen.cpp:239 +#: src/states_screens/arenas_screen.cpp:269 #: src/states_screens/tracks_screen.cpp:297 #: src/states_screens/tracks_screen.cpp:328 #: src/states_screens/kart_selection.cpp:938 #: src/states_screens/kart_selection.cpp:2064 #: src/states_screens/kart_selection.cpp:2096 -#: src/states_screens/arenas_screen.cpp:239 -#: src/states_screens/arenas_screen.cpp:269 #: src/states_screens/race_setup_screen.cpp:271 msgid "Locked : solve active challenges to gain access to more!" msgstr "" @@ -1282,13 +1288,13 @@ msgstr "" #. I18N: ./data/tracks/minigolf/track.xml -#: data/po/gui_strings.h:5 +#: data/po/gui_strings.h:53 msgid "Minigolf Mischief" msgstr "" #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the ui settings -#: data/po/gui_strings.h:678 +#: data/po/gui_strings.h:461 msgid "Minimal Race GUI" msgstr "" @@ -1306,31 +1312,31 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:690 +#: data/po/gui_strings.h:532 msgid "Multiplayer" msgstr "" +#. I18N: ./data/gui/help4.stkgui +#. I18N: Tab in help menu +#. I18N: ./data/gui/help1.stkgui +#. I18N: Tab in help menu #. I18N: ./data/gui/help2.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help4.stkgui -#. I18N: Tab in help menu #. I18N: ./data/gui/help3.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help1.stkgui -#. I18N: Tab in help menu -#: data/po/gui_strings.h:155 data/po/gui_strings.h:306 -#: data/po/gui_strings.h:457 data/po/gui_strings.h:752 +#: data/po/gui_strings.h:241 data/po/gui_strings.h:625 +#: data/po/gui_strings.h:671 data/po/gui_strings.h:735 msgid "Multiplayer" msgstr "" #. I18N: ./data/gui/options_audio.stkgui #. I18N: Section in the audio/video settings submenu -#: data/po/gui_strings.h:342 +#: data/po/gui_strings.h:149 msgid "Music" msgstr "" #. I18N: ./data/gui/story_mode_new.stkgui -#: data/po/gui_strings.h:544 +#: data/po/gui_strings.h:359 msgid "New Game" msgstr "" @@ -1373,7 +1379,7 @@ msgstr "" #. I18N: ./data/karts/nolok/kart.xml -#: data/po/gui_strings.h:834 +#: data/po/gui_strings.h:840 msgid "Nolok" msgstr "" @@ -1388,7 +1394,7 @@ msgstr "" #. I18N: ./data/tracks/snowmountain/track.xml -#: data/po/gui_strings.h:17 +#: data/po/gui_strings.h:71 msgid "Northern Resort" msgstr "" @@ -1400,12 +1406,12 @@ #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Difficulty +#. I18N: ./data/gui/story_mode_new.stkgui +#. I18N: Difficulty #. I18N: ./data/gui/racesetup.stkgui #. I18N: Difficulty -#. I18N: ./data/gui/story_mode_new.stkgui -#. I18N: Difficulty -#: data/po/gui_strings.h:197 data/po/gui_strings.h:272 -#: data/po/gui_strings.h:552 +#: data/po/gui_strings.h:130 data/po/gui_strings.h:367 +#: data/po/gui_strings.h:777 msgid "Novice" msgstr "" @@ -1416,13 +1422,13 @@ #. I18N: ./data/gui/racesetup.stkgui #. I18N: In race setup menu -#: data/po/gui_strings.h:268 +#: data/po/gui_strings.h:773 msgid "Number of AI karts" msgstr "" #. I18N: ./data/gui/soccer_setup.stkgui #. I18N: In soccer setup menu -#: data/po/gui_strings.h:408 +#: data/po/gui_strings.h:802 msgid "Number of goals to win" msgstr "" @@ -1432,23 +1438,23 @@ msgstr "" #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix -#: data/po/gui_strings.h:107 data/po/gui_strings.h:813 +#: data/po/gui_strings.h:119 data/po/gui_strings.h:825 msgid "Off the beaten track" msgstr "" #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:80 data/po/gui_strings.h:83 +#: data/po/gui_strings.h:86 data/po/gui_strings.h:89 msgid "Oh yes, see, he's in my castle now and will be served for supper..." msgstr "" #. I18N: ./data/tracks/mines/track.xml -#: data/po/gui_strings.h:32 +#: data/po/gui_strings.h:77 msgid "Old Mine" msgstr "" #. I18N: ./data/tracks/olivermath/track.xml -#: data/po/gui_strings.h:20 +#: data/po/gui_strings.h:8 msgid "Oliver's Math Class" msgstr "" @@ -1461,19 +1467,19 @@ msgid "Oops! When you're in trouble, press <%s> to be rescued" msgstr "" +#. I18N: ./data/gui/race_paused_dialog.stkgui +#. I18N: Race paused button #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#. I18N: ./data/gui/race_paused_dialog.stkgui -#. I18N: Race paused button #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:533 data/po/gui_strings.h:644 -#: data/po/gui_strings.h:698 +#: data/po/gui_strings.h:348 data/po/gui_strings.h:490 +#: data/po/gui_strings.h:540 msgid "Options" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:174 +#: data/po/gui_strings.h:690 msgid "Parachute - slows down all karts in a better position." msgstr "" @@ -1482,9 +1488,9 @@ msgid "Pause Game" msgstr "" +#. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: ./data/gui/overworld_dialog.stkgui -#. I18N: ./data/gui/race_paused_dialog.stkgui -#: data/po/gui_strings.h:521 data/po/gui_strings.h:624 +#: data/po/gui_strings.h:328 data/po/gui_strings.h:478 msgid "Paused" msgstr "" @@ -1498,13 +1504,13 @@ msgstr "" #. I18N: ./data/karts/pidgin/kart.xml -#: data/po/gui_strings.h:852 +#: data/po/gui_strings.h:858 msgid "Pidgin" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:248 +#: data/po/gui_strings.h:435 msgid "Pixel Shaders" msgstr "" @@ -1515,17 +1521,17 @@ msgstr "" #. I18N: ./data/gui/tutorial.stkgui -#: data/po/gui_strings.h:331 +#: data/po/gui_strings.h:602 msgid "Play all" msgstr "" #. I18N: ./data/gui/options_players.stkgui #. I18N: Section in the settings menu +#: src/states_screens/options_screen_input2.cpp:73 #: src/states_screens/options_screen_input.cpp:140 +#: src/states_screens/options_screen_ui.cpp:113 #: src/states_screens/options_screen_audio.cpp:65 -#: src/states_screens/options_screen_input2.cpp:73 -#: src/states_screens/options_screen_video.cpp:89 -#: src/states_screens/options_screen_ui.cpp:113 data/po/gui_strings.h:507 +#: src/states_screens/options_screen_video.cpp:89 data/po/gui_strings.h:509 msgid "Players" msgstr "" @@ -1543,7 +1549,7 @@ msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:168 +#: data/po/gui_strings.h:684 msgid "" "Plunger - throw straight to pull an opponent back, or throw while looking " "back to make one lose sight." @@ -1551,7 +1557,7 @@ #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:244 +#: data/po/gui_strings.h:431 msgid "Post-processing (motion blur)" msgstr "" @@ -1565,24 +1571,24 @@ #. I18N: When configuring input #. I18N: ./data/gui/press_a_key_dialog.stkgui #. I18N: When configuring input -#: data/po/gui_strings.h:574 data/po/gui_strings.h:725 +#: data/po/gui_strings.h:177 data/po/gui_strings.h:472 msgid "Press ESC to cancel" msgstr "" #. I18N: ./data/gui/press_a_key_dialog.stkgui -#: data/po/gui_strings.h:717 +#: data/po/gui_strings.h:464 msgid "Press a key" msgstr "" #. I18N: ./data/gui/options_input.stkgui #. I18N: In key bindings configuration menu -#: data/po/gui_strings.h:585 +#: data/po/gui_strings.h:215 msgid "Press enter or double-click on a device to configure it" msgstr "" #. I18N: ./data/gui/options_players.stkgui #. I18N: In players configuration menu -#: data/po/gui_strings.h:514 +#: data/po/gui_strings.h:516 msgid "Press enter or double-click on a player to edit him/her" msgstr "" @@ -1611,7 +1617,7 @@ msgstr "" #. I18N: ./data/karts/puffy/kart.xml -#: data/po/gui_strings.h:840 +#: data/po/gui_strings.h:852 msgid "Puffy" msgstr "" @@ -1623,15 +1629,15 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:714 +#: data/po/gui_strings.h:556 msgid "Quit" msgstr "" #. I18N: ./data/gui/select_challenge.stkgui #. I18N: ./data/gui/racesetup.stkgui #. I18N: ./data/gui/soccer_setup.stkgui -#: data/po/gui_strings.h:189 data/po/gui_strings.h:264 -#: data/po/gui_strings.h:404 +#: data/po/gui_strings.h:122 data/po/gui_strings.h:769 +#: data/po/gui_strings.h:798 msgid "Race Setup" msgstr "" @@ -1648,14 +1654,14 @@ msgid "Random Track" msgstr "" +#: src/states_screens/race_gui.cpp:104 #: src/states_screens/race_gui_overworld.cpp:107 -#: src/states_screens/race_gui.cpp:104 msgid "Rank" msgstr "" #. I18N: ./data/gui/addons_screen.stkgui #. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating -#: data/po/gui_strings.h:606 +#: data/po/gui_strings.h:567 msgid "Rating >=" msgstr "" @@ -1670,20 +1676,20 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:464 +#: data/po/gui_strings.h:742 msgid "" "Regular Race: All blows allowed, so catch weapons and make clever use of " "them!" msgstr "" #. I18N: ./data/gui/story_mode_lobby.stkgui -#: data/po/gui_strings.h:257 +#: data/po/gui_strings.h:708 msgid "Remember me" msgstr "" #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:397 +#: data/po/gui_strings.h:298 msgid "Remember window location" msgstr "" @@ -1719,7 +1725,7 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the graphics settings -#: data/po/gui_strings.h:389 +#: data/po/gui_strings.h:290 msgid "Resolution" msgstr "" @@ -1729,13 +1735,13 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:636 +#: data/po/gui_strings.h:340 msgid "Restart Race" msgstr "" #. I18N: ./data/gui/track_info_dialog.stkgui #. I18N: Drive the track reverse -#: data/po/gui_strings.h:129 +#: data/po/gui_strings.h:318 msgid "Reverse" msgstr "" @@ -1750,12 +1756,12 @@ msgstr "" #. I18N: ./data/karts/sara/kart.xml -#: data/po/gui_strings.h:831 +#: data/po/gui_strings.h:861 msgid "Sara" msgstr "" #. I18N: ./data/tracks/scotland/track.xml -#: data/po/gui_strings.h:65 +#: data/po/gui_strings.h:2 msgid "Scotland" msgstr "" @@ -1765,24 +1771,24 @@ msgstr "" #. I18N: ./data/gui/story_mode_lobby.stkgui -#: data/po/gui_strings.h:254 +#: data/po/gui_strings.h:705 msgid "Select a Player" msgstr "" #. I18N: ./data/gui/racesetup.stkgui -#: data/po/gui_strings.h:287 +#: data/po/gui_strings.h:792 msgid "Select a game mode" msgstr "" #. I18N: ./data/gui/overworld_dialog.stkgui #. I18N: Race paused button -#: data/po/gui_strings.h:529 +#: data/po/gui_strings.h:486 msgid "Select kart" msgstr "" #. I18N: ./data/gui/story_mode_new.stkgui #. I18N: In the new story mode game dialog -#: data/po/gui_strings.h:548 +#: data/po/gui_strings.h:363 msgid "Select your identity" msgstr "" @@ -1793,23 +1799,23 @@ #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: src/states_screens/race_result_gui.cpp:146 data/po/gui_strings.h:632 +#: src/states_screens/race_result_gui.cpp:146 data/po/gui_strings.h:336 msgid "Setup New Race" msgstr "" #. I18N: ./data/tracks/sandtrack/track.xml -#: data/po/gui_strings.h:50 +#: data/po/gui_strings.h:65 msgid "Shifting Sands" msgstr "" #. I18N: ./data/tracks/city/track.xml -#: data/po/gui_strings.h:14 +#: data/po/gui_strings.h:17 msgid "Shiny Suburbs" msgstr "" #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:686 +#: data/po/gui_strings.h:528 msgid "Single-player" msgstr "" @@ -1825,12 +1831,12 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: In the graphics settings -#: data/po/gui_strings.h:666 +#: data/po/gui_strings.h:449 msgid "Skin" msgstr "" #. I18N: ./data/tracks/snowtuxpeak/track.xml -#: data/po/gui_strings.h:35 +#: data/po/gui_strings.h:14 msgid "Snow Peak" msgstr "" @@ -1840,13 +1846,13 @@ msgstr "" #. I18N: ./data/tracks/soccer_field/track.xml -#: data/po/gui_strings.h:59 +#: data/po/gui_strings.h:32 msgid "Soccer field" msgstr "" #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:480 +#: data/po/gui_strings.h:758 msgid "" "Soccer: Only in multiplayer games. Use your kart to push the ball into the " "goal." @@ -1866,18 +1872,18 @@ #. I18N: ./data/gui/options_audio.stkgui #. I18N: Section in audio/video settings submenu -#: data/po/gui_strings.h:354 +#: data/po/gui_strings.h:161 msgid "Sound Effects" msgstr "" #. I18N: ./data/gui/arenas.stkgui #. I18N: track group -#: data/po/gui_strings.h:799 +#: data/po/gui_strings.h:587 msgid "Standard" msgstr "" #. I18N: ./data/gui/story_mode_new.stkgui -#: data/po/gui_strings.h:563 +#: data/po/gui_strings.h:378 msgid "Start Game" msgstr "" @@ -1886,7 +1892,7 @@ msgstr "" #. I18N: ./data/gui/track_info_dialog.stkgui -#: data/po/gui_strings.h:136 +#: data/po/gui_strings.h:325 msgid "Start Race" msgstr "" @@ -1902,54 +1908,54 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: data/po/gui_strings.h:682 +#: data/po/gui_strings.h:524 msgid "Story Mode" msgstr "" #. I18N: ./data/tracks/subsea/track.xml -#: data/po/gui_strings.h:11 +#: data/po/gui_strings.h:56 msgid "Subsea" msgstr "" #. I18N: ./data/gui/racesetup.stkgui #. I18N: Difficulty -#: data/po/gui_strings.h:284 +#: data/po/gui_strings.h:789 msgid "SuperTux" msgstr "" #. I18N: ./data/gui/addons_screen.stkgui -#: data/po/gui_strings.h:598 +#: data/po/gui_strings.h:559 msgid "SuperTuxKart Addons" msgstr "" +#. I18N: ./data/gui/help4.stkgui +#. I18N: ./data/gui/help1.stkgui #. I18N: ./data/gui/help2.stkgui -#. I18N: ./data/gui/help4.stkgui #. I18N: ./data/gui/help3.stkgui -#. I18N: ./data/gui/help1.stkgui -#: data/po/gui_strings.h:139 data/po/gui_strings.h:290 -#: data/po/gui_strings.h:441 data/po/gui_strings.h:736 +#: data/po/gui_strings.h:225 data/po/gui_strings.h:609 +#: data/po/gui_strings.h:655 data/po/gui_strings.h:719 msgid "SuperTuxKart Help" msgstr "" #. I18N: ./data/gui/options_audio.stkgui +#. I18N: ./data/gui/options_input.stkgui #. I18N: ./data/gui/options_video.stkgui #. I18N: ./data/gui/options_device.stkgui +#. I18N: ./data/gui/options_ui.stkgui #. I18N: ./data/gui/options_players.stkgui -#. I18N: ./data/gui/options_input.stkgui -#. I18N: ./data/gui/options_ui.stkgui -#: data/po/gui_strings.h:334 data/po/gui_strings.h:365 -#: data/po/gui_strings.h:426 data/po/gui_strings.h:503 -#: data/po/gui_strings.h:577 data/po/gui_strings.h:658 +#: data/po/gui_strings.h:141 data/po/gui_strings.h:207 +#: data/po/gui_strings.h:266 data/po/gui_strings.h:392 +#: data/po/gui_strings.h:441 data/po/gui_strings.h:505 msgid "SuperTuxKart Options" msgstr "" #. I18N: ./data/gui/help4.stkgui -#: data/po/gui_strings.h:309 +#: data/po/gui_strings.h:244 msgid "SuperTuxKart can be played in multiplayer mode on the same computer" msgstr "" #. I18N: ./data/gui/help3.stkgui -#: data/po/gui_strings.h:460 +#: data/po/gui_strings.h:738 msgid "SuperTuxKart features several game modes" msgstr "" @@ -1962,19 +1968,19 @@ msgstr "" #. I18N: ./data/karts/suzanne/kart.xml -#: data/po/gui_strings.h:867 +#: data/po/gui_strings.h:837 msgid "Suzanne" msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:180 +#: data/po/gui_strings.h:696 msgid "" "Swapper - gift boxes are transformed into bananas and vice versa for a short " "time." msgstr "" #. I18N: ./data/gui/help2.stkgui -#: data/po/gui_strings.h:186 +#: data/po/gui_strings.h:702 msgid "Swatter - will squash karts close by, slowing them down." msgstr "" @@ -1985,18 +1991,18 @@ #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:236 +#: data/po/gui_strings.h:423 msgid "Texture filtering" msgstr "" #. I18N: ./data/gui/help1.stkgui #. I18N: in the help menu -#: data/po/gui_strings.h:775 +#: data/po/gui_strings.h:648 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost." msgstr "" #. I18N: ./data/tracks/islandtrack/track.xml -#: data/po/gui_strings.h:38 +#: data/po/gui_strings.h:59 msgid "The Island" msgstr "" @@ -2005,7 +2011,7 @@ msgstr "" #. I18N: ./data/tracks/stadium/track.xml -#: data/po/gui_strings.h:53 +#: data/po/gui_strings.h:41 msgid "The Stadium" msgstr "" @@ -2030,7 +2036,7 @@ #. I18N: ./data/gui/help3.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:468 +#: data/po/gui_strings.h:746 msgid "Time Trial: Contains no powerups, so only your driving skills matter!" msgstr "" @@ -2048,7 +2054,7 @@ #. I18N: ./data/gui/help2.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:159 +#: data/po/gui_strings.h:675 msgid "To help you win, there are some powerups you can collect :" msgstr "" @@ -2071,7 +2077,7 @@ #. I18N: ./data/gui/addons_screen.stkgui #. I18N: Section in the addons menu -#: data/po/gui_strings.h:614 +#: data/po/gui_strings.h:575 msgid "Tracks" msgstr "" @@ -2082,30 +2088,30 @@ #. I18N: ./data/gui/main.stkgui #. I18N: Main menu button -#: src/states_screens/race_gui_overworld.cpp:448 data/po/gui_strings.h:706 +#: src/states_screens/race_gui_overworld.cpp:448 data/po/gui_strings.h:548 msgid "Tutorial" msgstr "" #. I18N: ./data/gui/tutorial.stkgui #. I18N: Title for tutorials screen -#: data/po/gui_strings.h:328 +#: data/po/gui_strings.h:599 msgid "Tutorial : Selection Room" msgstr "" #. I18N: ./data/karts/tux/kart.xml -#: data/po/gui_strings.h:861 +#: data/po/gui_strings.h:849 msgid "Tux" msgstr "" #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Type of race, in a challenge -#: data/po/gui_strings.h:193 +#: data/po/gui_strings.h:126 msgid "Type :" msgstr "" #. I18N: ./data/gui/addons_loading.stkgui #. I18N: Add-on screen action -#: data/po/gui_strings.h:787 +#: data/po/gui_strings.h:188 msgid "Uninstall" msgstr "" @@ -2120,7 +2126,7 @@ #. I18N: ./data/gui/addons_screen.stkgui #. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items -#: data/po/gui_strings.h:602 +#: data/po/gui_strings.h:563 msgid "Updated" msgstr "" @@ -2130,13 +2136,13 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:385 +#: data/po/gui_strings.h:286 msgid "Use Frame Buffer Objects (requires restart)" msgstr "" #. I18N: ./data/gui/soccer_setup.stkgui #. I18N: In soccer setup menu -#: data/po/gui_strings.h:412 +#: data/po/gui_strings.h:806 msgid "Use left/right to choose your team" msgstr "" @@ -2147,16 +2153,16 @@ #. I18N: ./data/gui/options_ui.stkgui #. I18N: Section in the settings menu +#: src/states_screens/options_screen_input2.cpp:72 #: src/states_screens/options_screen_input.cpp:139 +#: src/states_screens/options_screen_players.cpp:72 #: src/states_screens/options_screen_audio.cpp:64 -#: src/states_screens/options_screen_input2.cpp:72 -#: src/states_screens/options_screen_video.cpp:88 -#: src/states_screens/options_screen_players.cpp:72 data/po/gui_strings.h:662 +#: src/states_screens/options_screen_video.cpp:88 data/po/gui_strings.h:445 msgid "User Interface" msgstr "" #. I18N: ./data/gui/soccer_setup.stkgui -#: data/po/gui_strings.h:415 +#: data/po/gui_strings.h:809 msgid "VS" msgstr "" @@ -2167,7 +2173,7 @@ #. I18N: ./data/gui/options_video.stkgui #. I18N: In the video settings -#: data/po/gui_strings.h:381 +#: data/po/gui_strings.h:282 msgid "Vertical Sync (requires restart)" msgstr "" @@ -2175,7 +2181,7 @@ #. I18N: Music volume in options #. I18N: ./data/gui/options_audio.stkgui #. I18N: Sound volume in options -#: data/po/gui_strings.h:350 data/po/gui_strings.h:362 +#: data/po/gui_strings.h:157 data/po/gui_strings.h:169 msgid "Volume" msgstr "" @@ -2190,22 +2196,22 @@ "working." msgstr "" +#. I18N: ./data/gui/help4.stkgui +#. I18N: Tab in help menu +#. I18N: ./data/gui/help1.stkgui +#. I18N: Tab in help menu #. I18N: ./data/gui/help2.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help4.stkgui -#. I18N: Tab in help menu #. I18N: ./data/gui/help3.stkgui #. I18N: Tab in help menu -#. I18N: ./data/gui/help1.stkgui -#. I18N: Tab in help menu -#: data/po/gui_strings.h:147 data/po/gui_strings.h:298 -#: data/po/gui_strings.h:449 data/po/gui_strings.h:744 +#: data/po/gui_strings.h:233 data/po/gui_strings.h:617 +#: data/po/gui_strings.h:663 data/po/gui_strings.h:727 msgid "Weapons" msgstr "" #. I18N: ./data/gui/custom_video_settings.stkgui #. I18N: Video settings -#: data/po/gui_strings.h:228 +#: data/po/gui_strings.h:415 msgid "Weather Effects" msgstr "" @@ -2217,13 +2223,13 @@ #. I18N: Cutscene subtitle from ./data/tracks/introcutscene2/scene.xml #. I18N: ./data/tracks/introcutscene2/scene.xml -#: data/po/gui_strings.h:74 data/po/gui_strings.h:77 +#: data/po/gui_strings.h:80 data/po/gui_strings.h:83 msgid "What's wrong, little hippies? Your great gnu leader is missing?" msgstr "" #. I18N: ./data/gui/help4.stkgui #. I18N: In the help menu -#: data/po/gui_strings.h:320 +#: data/po/gui_strings.h:255 msgid "" "When input devices are configured, you are ready to play. Select the " "'multiplayer race' icon in the main menu. When it is time to choose a kart, " @@ -2234,23 +2240,23 @@ msgstr "" #. I18N: ./data/karts/wilber/kart.xml -#: data/po/gui_strings.h:858 +#: data/po/gui_strings.h:870 msgid "Wilber" msgstr "" #. I18N: ./data/tracks/xr591/track.xml -#: data/po/gui_strings.h:41 +#: data/po/gui_strings.h:38 msgid "XR591" msgstr "" #. I18N: ./data/karts/xfcemouse/kart.xml -#: data/po/gui_strings.h:825 +#: data/po/gui_strings.h:828 msgid "Xue" msgstr "" #. I18N: ./data/gui/confirm_dialog.stkgui #. I18N: In a 'are you sure?' dialog -#: data/po/gui_strings.h:209 +#: data/po/gui_strings.h:259 msgid "Yes" msgstr "" @@ -2259,7 +2265,7 @@ msgstr "" #. I18N: ./data/gui/options_players.stkgui -#: data/po/gui_strings.h:510 +#: data/po/gui_strings.h:512 msgid "You are playing as" msgstr "" @@ -2339,7 +2345,7 @@ msgstr "" #. I18N: ./data/tracks/zengarden/track.xml -#: data/po/gui_strings.h:71 +#: data/po/gui_strings.h:74 msgid "Zen Garden" msgstr "" @@ -2357,12 +2363,12 @@ msgid "featured" msgstr "" +#. I18N: arena group name #. I18N: track group name #. I18N: kart group name -#. I18N: arena group name +#: src/states_screens/arenas_screen.cpp:79 #: src/states_screens/tracks_screen.cpp:174 #: src/states_screens/kart_selection.cpp:1040 -#: src/states_screens/arenas_screen.cpp:79 msgid "standard" msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-11-30 20:08:11
|
Revision: 14587 http://sourceforge.net/p/supertuxkart/code/14587 Author: auria Date: 2013-11-30 20:08:07 +0000 (Sat, 30 Nov 2013) Log Message: ----------- Add new egypt music by 0zone0ne Modified Paths: -------------- main/trunk/data/tracks/sandtrack/track.xml Added Paths: ----------- main/trunk/data/music/egypt.music main/trunk/data/music/egypt.ogg Removed Paths: ------------- main/trunk/data/music/TheDeadRocks-EasyJob.ogg main/trunk/data/music/TheDeadRocks-GreenSecretFromAmazonia.music main/trunk/data/music/TheDeadRocks-GreenSecretFromAmazonia.ogg Deleted: main/trunk/data/music/TheDeadRocks-EasyJob.ogg =================================================================== (Binary files differ) Deleted: main/trunk/data/music/TheDeadRocks-GreenSecretFromAmazonia.music =================================================================== --- main/trunk/data/music/TheDeadRocks-GreenSecretFromAmazonia.music 2013-11-29 22:33:11 UTC (rev 14586) +++ main/trunk/data/music/TheDeadRocks-GreenSecretFromAmazonia.music 2013-11-30 20:08:07 UTC (rev 14587) @@ -1,5 +0,0 @@ -<?xml version="1.0"?> -<music title = "Green Secret From Amazonia" - composer = "The Dead Rocks" - file = "TheDeadRocks-GreenSecretFromAmazonia.ogg" /> - Deleted: main/trunk/data/music/TheDeadRocks-GreenSecretFromAmazonia.ogg =================================================================== (Binary files differ) Added: main/trunk/data/music/egypt.music =================================================================== --- main/trunk/data/music/egypt.music (rev 0) +++ main/trunk/data/music/egypt.music 2013-11-30 20:08:07 UTC (rev 14587) @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<music title = "Egypt" + composer = "0zone0ne" + file = "egypt.ogg" /> + Added: main/trunk/data/music/egypt.ogg =================================================================== (Binary files differ) Index: main/trunk/data/music/egypt.ogg =================================================================== --- main/trunk/data/music/egypt.ogg 2013-11-29 22:33:11 UTC (rev 14586) +++ main/trunk/data/music/egypt.ogg 2013-11-30 20:08:07 UTC (rev 14587) Property changes on: main/trunk/data/music/egypt.ogg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: main/trunk/data/tracks/sandtrack/track.xml =================================================================== --- main/trunk/data/tracks/sandtrack/track.xml 2013-11-29 22:33:11 UTC (rev 14586) +++ main/trunk/data/tracks/sandtrack/track.xml 2013-11-30 20:08:07 UTC (rev 14587) @@ -4,7 +4,7 @@ version = "5" groups = "standard" designer = "ctdabomb" - music = "TheDeadRocks-GreenSecretFromAmazonia.music" + music = "egypt.music" screenshot = "sshot-sandtrack.jpg" smooth-normals = "true" reverse = "Y" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-12-07 16:53:34
|
Revision: 14650 http://sourceforge.net/p/supertuxkart/code/14650 Author: auria Date: 2013-12-07 16:53:32 +0000 (Sat, 07 Dec 2013) Log Message: ----------- Add new music for minigolf Modified Paths: -------------- main/trunk/data/tracks/minigolf/track.xml Added Paths: ----------- main/trunk/data/music/bay.music main/trunk/data/music/bay.ogg Added: main/trunk/data/music/bay.music =================================================================== --- main/trunk/data/music/bay.music (rev 0) +++ main/trunk/data/music/bay.music 2013-12-07 16:53:32 UTC (rev 14650) @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<music title = "Bay" + composer = "0zone0ne" + file = "bay.ogg"/> Added: main/trunk/data/music/bay.ogg =================================================================== (Binary files differ) Index: main/trunk/data/music/bay.ogg =================================================================== --- main/trunk/data/music/bay.ogg 2013-12-07 16:23:40 UTC (rev 14649) +++ main/trunk/data/music/bay.ogg 2013-12-07 16:53:32 UTC (rev 14650) Property changes on: main/trunk/data/music/bay.ogg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: main/trunk/data/tracks/minigolf/track.xml =================================================================== --- main/trunk/data/tracks/minigolf/track.xml 2013-12-07 16:23:40 UTC (rev 14649) +++ main/trunk/data/tracks/minigolf/track.xml 2013-12-07 16:53:32 UTC (rev 14650) @@ -4,7 +4,7 @@ version = "5" groups = "standard" designer = "Mac" - music = "Boom_boom_boom.music" + music = "bay.music" screenshot = "minigolf.jpg" smooth-normals = "false" reverse = "Y" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2013-12-09 13:11:13
|
Revision: 14686 http://sourceforge.net/p/supertuxkart/code/14686 Author: nixt Date: 2013-12-09 13:11:09 +0000 (Mon, 09 Dec 2013) Log Message: ----------- SVN messed up data/shaders in my branch. 76 files in local copy, 21 on SF. Re-adding folder to branch. Added Paths: ----------- main/trunk/data/shaders/ main/trunk/data/shaders/MLAA_COPYING main/trunk/data/shaders/Makefile.am main/trunk/data/shaders/bloom.frag main/trunk/data/shaders/bloomblend.frag main/trunk/data/shaders/bloompower.frag main/trunk/data/shaders/bubble.frag main/trunk/data/shaders/bubble.vert main/trunk/data/shaders/caustics.frag main/trunk/data/shaders/check.sh main/trunk/data/shaders/collapse.frag main/trunk/data/shaders/color_levels.frag main/trunk/data/shaders/colorize.frag main/trunk/data/shaders/colorize_ref.frag main/trunk/data/shaders/displace.frag main/trunk/data/shaders/displace.vert main/trunk/data/shaders/farplane.vert main/trunk/data/shaders/flip.frag main/trunk/data/shaders/fog.frag main/trunk/data/shaders/gaussian3h.frag main/trunk/data/shaders/gaussian3v.frag main/trunk/data/shaders/gaussian6h.frag main/trunk/data/shaders/gaussian6v.frag main/trunk/data/shaders/glow.frag main/trunk/data/shaders/godfade.frag main/trunk/data/shaders/godray.frag main/trunk/data/shaders/grass.frag main/trunk/data/shaders/grass.vert main/trunk/data/shaders/gum_shield.frag main/trunk/data/shaders/gum_shield.vert main/trunk/data/shaders/lightbeam.frag main/trunk/data/shaders/lightbeam.vert main/trunk/data/shaders/lightblend.frag main/trunk/data/shaders/mipviz.frag main/trunk/data/shaders/mlaa_blend2.frag main/trunk/data/shaders/mlaa_color1.frag main/trunk/data/shaders/mlaa_neigh3.frag main/trunk/data/shaders/mlaa_offset.vert main/trunk/data/shaders/motion_blur.frag main/trunk/data/shaders/motion_blur.vert main/trunk/data/shaders/multiply.frag main/trunk/data/shaders/normalmap.frag main/trunk/data/shaders/normalmap.vert main/trunk/data/shaders/objectpass.frag main/trunk/data/shaders/objectpass.vert main/trunk/data/shaders/objectpass_ref.frag main/trunk/data/shaders/objectpass_rimlit.frag main/trunk/data/shaders/objectpass_rimlit.vert main/trunk/data/shaders/objectpass_spheremap.frag main/trunk/data/shaders/pass.frag main/trunk/data/shaders/pass.vert main/trunk/data/shaders/penumbrah.frag main/trunk/data/shaders/penumbrav.frag main/trunk/data/shaders/pointlight.frag main/trunk/data/shaders/ppdisplace.frag main/trunk/data/shaders/rain.frag main/trunk/data/shaders/rain.vert main/trunk/data/shaders/shadowgen.frag main/trunk/data/shaders/shadowimportance.frag main/trunk/data/shaders/shadowimportance.vert main/trunk/data/shaders/shadowpass.frag main/trunk/data/shaders/shadowpass.vert main/trunk/data/shaders/shadowwarph.frag main/trunk/data/shaders/shadowwarpv.frag main/trunk/data/shaders/skinning.vert main/trunk/data/shaders/snow.frag main/trunk/data/shaders/snow.vert main/trunk/data/shaders/spheremap.frag main/trunk/data/shaders/spheremap.vert main/trunk/data/shaders/splatting.frag main/trunk/data/shaders/splatting.vert main/trunk/data/shaders/ssao.frag main/trunk/data/shaders/sunlight.frag main/trunk/data/shaders/sunlightshadow.frag main/trunk/data/shaders/water.frag main/trunk/data/shaders/water.vert main/trunk/data/shaders/white.frag Removed Paths: ------------- main/trunk/data/shaders/ Added: main/trunk/data/shaders/MLAA_COPYING =================================================================== --- main/trunk/data/shaders/MLAA_COPYING (rev 0) +++ main/trunk/data/shaders/MLAA_COPYING 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,39 @@ +/** + * Copyright (C) 2010 Jorge Jimenez (jo...@ir...) + * Copyright (C) 2010 Belen Masia (bm...@un...) + * Copyright (C) 2010 Jose I. Echevarria (jos...@gm...) + * Copyright (C) 2010 Fernando Navarro (fer...@mi...) + * Copyright (C) 2010 Diego Gutierrez (di...@un...) + * Copyright (C) 2011 Lauri Kasanen (ca...@gm...) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the following statement: + * + * "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia, + * Jose I. Echevarria, Fernando Navarro and Diego Gutierrez." + * + * Only for use in the Mesa project, this point 2 is filled by naming the + * technique Jimenez's MLAA in the Mesa config options. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS + * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are + * those of the authors and should not be interpreted as representing official + * policies, either expressed or implied, of the copyright holders. + */ Added: main/trunk/data/shaders/Makefile.am =================================================================== --- main/trunk/data/shaders/Makefile.am (rev 0) +++ main/trunk/data/shaders/Makefile.am 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,7 @@ +# data/shaders/ + +pkgdatadir = $(datadir)/games/@PACKAGE@/data/shaders + +dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.frag") \ + $(shell find $(srcdir) -name "*.vert") + Added: main/trunk/data/shaders/bloom.frag =================================================================== --- main/trunk/data/shaders/bloom.frag (rev 0) +++ main/trunk/data/shaders/bloom.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,13 @@ +uniform sampler2D tex; +uniform float low; + +void main() +{ + vec3 weights = vec3(0.2126, 0.7152, 0.0722); // ITU-R BT. 709 + vec3 col = texture2D(tex, gl_TexCoord[0].xy).xyz; + float luma = dot(weights, col); + + col *= smoothstep(low, 0.9, luma); + + gl_FragColor = vec4(col, 1.0); +} Added: main/trunk/data/shaders/bloomblend.frag =================================================================== --- main/trunk/data/shaders/bloomblend.frag (rev 0) +++ main/trunk/data/shaders/bloomblend.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,10 @@ +uniform sampler2D tex; + +void main() +{ + vec4 col = texture2D(tex, gl_TexCoord[0].xy); + + col.xyz *= 10.0 * col.a; + + gl_FragColor = vec4(col.xyz, 1.0); +} Added: main/trunk/data/shaders/bloompower.frag =================================================================== --- main/trunk/data/shaders/bloompower.frag (rev 0) +++ main/trunk/data/shaders/bloompower.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,11 @@ +uniform float power; +uniform sampler2D tex; + +void main() +{ + vec4 col = texture2D(tex, gl_TexCoord[0].xy); + if (col.a < 0.5) + discard; + + gl_FragColor = vec4(col.xyz, power); +} Added: main/trunk/data/shaders/bubble.frag =================================================================== --- main/trunk/data/shaders/bubble.frag (rev 0) +++ main/trunk/data/shaders/bubble.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,26 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +uniform sampler2D tex; +uniform float transparency; +varying vec2 uv; + +void main() +{ + gl_FragColor = texture2D(tex, uv); + gl_FragColor.a *= transparency; +} Added: main/trunk/data/shaders/bubble.vert =================================================================== --- main/trunk/data/shaders/bubble.vert (rev 0) +++ main/trunk/data/shaders/bubble.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,33 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +// Creates a bubble (wave) effect by distorting the texture depending on time + +uniform float time; +varying vec2 uv; + +void main() +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_Position = ftransform(); + + float delta_x = cos(time*3.0) * sin( 4.0 * gl_TexCoord[0].st.s * 6.28318531 ); + float delta_y = cos(time*2.0) * sin( 3.0 * gl_TexCoord[0].st.t * 6.28318531 ); + + uv = gl_TexCoord[0].st + vec2(0.02*delta_x, 0.02*delta_y); +} Added: main/trunk/data/shaders/caustics.frag =================================================================== --- main/trunk/data/shaders/caustics.frag (rev 0) +++ main/trunk/data/shaders/caustics.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,17 @@ +uniform sampler2D tex; +uniform sampler2D caustictex; +uniform vec2 dir; +uniform vec2 dir2; + +void main() +{ + vec2 tc = gl_TexCoord[0].xy; + + vec3 col = texture2D(tex, tc).xyz; + float caustic = texture2D(caustictex, tc + dir).x; + float caustic2 = texture2D(caustictex, (tc.yx + dir2 * vec2(-0.6, 0.3)) * vec2(0.6)).x; + + col += caustic * caustic2 * 10.0; + + gl_FragColor = vec4(col, 1.0); +} Added: main/trunk/data/shaders/check.sh =================================================================== --- main/trunk/data/shaders/check.sh (rev 0) +++ main/trunk/data/shaders/check.sh 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Run a syntax check on all the shaders. +# +# The utility glslopt may be gotten from github.com/clbr/glsl-optimizer. + +out() { + rm -f *.out + echo Failed: $1 + exit 1 +} + + +for vert in *.vert; do + glslopt -v $vert + [ $? -ne 0 ] && out $vert +done + +for frag in *.frag; do + glslopt -f $frag + [ $? -ne 0 ] && out $frag +done + + +rm -f *.out Added: main/trunk/data/shaders/collapse.frag =================================================================== --- main/trunk/data/shaders/collapse.frag (rev 0) +++ main/trunk/data/shaders/collapse.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,25 @@ +uniform sampler2D tex; +uniform sampler2D oldtex; +uniform vec2 pixel; +uniform vec2 multi; +uniform int size; + +void main() +{ + float res = 0.0; + vec2 tc = gl_TexCoord[0].xy; +// tc.y = 1.0 - tc.y; + tc *= multi; + + for (int i = 0; i < size; i++) + { + float col = texture2D(tex, tc).x; + res = max(col, res); + + tc += pixel; + } + + float old = texture2D(oldtex, gl_TexCoord[0].xy).x; + + gl_FragColor = vec4(mix(old, res, 0.7)); +} Added: main/trunk/data/shaders/color_levels.frag =================================================================== --- main/trunk/data/shaders/color_levels.frag (rev 0) +++ main/trunk/data/shaders/color_levels.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,26 @@ +uniform sampler2D tex; +uniform vec3 inlevel; +uniform vec2 outlevel; + +void main() +{ + vec2 texc = gl_TexCoord[0].xy; + texc.y = 1.0 - texc.y; + + + vec4 col = texture2D(tex, texc); + + //col = col / (1 - col); + + float inBlack = inlevel.x; + float inWhite = inlevel.z; + float inGamma = inlevel.y; + + float outBlack = outlevel.x; + float outWhite = outlevel.y; + + col.rgb = (pow(((col.rgb * 255.0) - inBlack) / (inWhite - inBlack), + vec3(1.0 / inGamma)) * (outWhite - outBlack) + outBlack) / 255.0; + + gl_FragColor = vec4(col.rgb, 1.0); +} Added: main/trunk/data/shaders/colorize.frag =================================================================== --- main/trunk/data/shaders/colorize.frag (rev 0) +++ main/trunk/data/shaders/colorize.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,6 @@ +uniform vec3 col; + +void main() +{ + gl_FragColor = vec4(col, 1.0); +} Added: main/trunk/data/shaders/colorize_ref.frag =================================================================== --- main/trunk/data/shaders/colorize_ref.frag (rev 0) +++ main/trunk/data/shaders/colorize_ref.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,11 @@ +uniform vec3 col; +uniform sampler2D tex; + +void main() +{ + float alpha = texture2D(tex, gl_TexCoord[0].xy).a; + if (alpha < 0.5) + discard; + + gl_FragColor = vec4(col, 1.0); +} Added: main/trunk/data/shaders/displace.frag =================================================================== --- main/trunk/data/shaders/displace.frag (rev 0) +++ main/trunk/data/shaders/displace.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,40 @@ +uniform sampler2D tex; +uniform vec2 screen; +uniform vec2 dir; +uniform vec2 dir2; + +varying float camdist; + +void main() +{ + vec2 tc = gl_TexCoord[0].xy; + + vec4 col = vec4(0.0); + const float maxlen = 0.02; + + float horiz = texture2D(tex, tc + dir).x; + float vert = texture2D(tex, (tc.yx + dir2) * vec2(0.9)).x; + + vec2 offset = vec2(horiz, vert); + offset *= 2.0; + offset -= 1.0; + + // Fade according to distance to cam + float fade = 1.0 - smoothstep(1.0, 40.0, camdist); + + // Fade according to distance from the edges + vec2 edger = gl_TexCoord[1].xy; + const float mindist = 0.1; + fade *= smoothstep(0.0, mindist, edger.x) * smoothstep(0.0, mindist, edger.y) * + (1.0 - smoothstep(1.0 - mindist, 1.0, edger.x)) * + (1.0 - smoothstep(1.0 - mindist, 1.0, edger.y)); + + offset *= 50.0 * fade * maxlen; + + col.r = step(offset.x, 0.0) * -offset.x; + col.g = step(0.0, offset.x) * offset.x; + col.b = step(offset.y, 0.0) * -offset.y; + col.a = step(0.0, offset.y) * offset.y; + + gl_FragColor = col; +} Added: main/trunk/data/shaders/displace.vert =================================================================== --- main/trunk/data/shaders/displace.vert (rev 0) +++ main/trunk/data/shaders/displace.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,9 @@ +varying float camdist; + +void main() { + gl_Position = ftransform(); + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_TexCoord[1] = gl_MultiTexCoord1; + + camdist = length((gl_ModelViewMatrix * gl_Vertex).xyz); +} Added: main/trunk/data/shaders/farplane.vert =================================================================== --- main/trunk/data/shaders/farplane.vert (rev 0) +++ main/trunk/data/shaders/farplane.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,6 @@ +void main() { + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_TexCoord[1] = gl_MultiTexCoord1; + gl_Position = (gl_ModelViewProjectionMatrix * gl_Vertex).xyww; + gl_FrontColor = gl_Color; +} Added: main/trunk/data/shaders/flip.frag =================================================================== --- main/trunk/data/shaders/flip.frag (rev 0) +++ main/trunk/data/shaders/flip.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,10 @@ +uniform sampler2D tex; + +void main() +{ + vec2 texc = gl_TexCoord[0].xy; + texc.y = 1.0 - texc.y; + + + gl_FragColor = vec4(texture2D(tex, texc).rgb, 1.0); +} Added: main/trunk/data/shaders/fog.frag =================================================================== --- main/trunk/data/shaders/fog.frag (rev 0) +++ main/trunk/data/shaders/fog.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,34 @@ +uniform sampler2D tex; + +uniform float fogmax; +uniform float startH; +uniform float endH; +uniform float start; +uniform float end; +uniform vec3 col; +uniform vec3 campos; +uniform mat4 ipvmat; + +float decdepth(vec4 rgba) { + return dot(rgba, vec4(1.0, 1.0/255.0, 1.0/65025.0, 1.0/16581375.0)); +} + +void main() +{ + float z = decdepth(vec4(texture2D(tex, gl_TexCoord[0].xy).xyz, 0.0)); + + vec3 tmp = vec3(gl_TexCoord[0].xy, z); + tmp = tmp * 2.0 - 1.0; + + vec4 xpos = vec4(tmp, 1.0); + xpos = ipvmat * xpos; + xpos.xyz /= xpos.w; + + float dist = distance(campos, xpos.xyz); + float fog = smoothstep(start, end, dist); + fog *= 1.0 - smoothstep(startH, endH, xpos.y); + + fog = min(fog, fogmax); + + gl_FragColor = vec4(col, fog); +} Added: main/trunk/data/shaders/gaussian3h.frag =================================================================== --- main/trunk/data/shaders/gaussian3h.frag (rev 0) +++ main/trunk/data/shaders/gaussian3h.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,19 @@ +uniform sampler2D tex; +uniform vec2 pixel; + +// Gaussian separated blur with radius 3. + +void main() +{ + vec4 sum = vec4(0.0); + float X = gl_TexCoord[0].x; + float Y = gl_TexCoord[0].y; + + sum += texture2D(tex, vec2(X - 3.0 * pixel.x, Y)) * 0.03125; + sum += texture2D(tex, vec2(X - 1.3333 * pixel.x, Y)) * 0.328125; + sum += texture2D(tex, vec2(X, Y)) * 0.273438; + sum += texture2D(tex, vec2(X + 1.3333 * pixel.x, Y)) * 0.328125; + sum += texture2D(tex, vec2(X + 3.0 * pixel.x, Y)) * 0.03125; + + gl_FragColor = sum; +} Added: main/trunk/data/shaders/gaussian3v.frag =================================================================== --- main/trunk/data/shaders/gaussian3v.frag (rev 0) +++ main/trunk/data/shaders/gaussian3v.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,19 @@ +uniform sampler2D tex; +uniform vec2 pixel; + +// Gaussian separated blur with radius 3. + +void main() +{ + vec4 sum = vec4(0.0); + float X = gl_TexCoord[0].x; + float Y = gl_TexCoord[0].y; + + sum += texture2D(tex, vec2(X, Y - 3.0 * pixel.y)) * 0.03125; + sum += texture2D(tex, vec2(X, Y - 1.3333 * pixel.y)) * 0.328125; + sum += texture2D(tex, vec2(X, Y)) * 0.273438; + sum += texture2D(tex, vec2(X, Y + 1.3333 * pixel.y)) * 0.328125; + sum += texture2D(tex, vec2(X, Y + 3.0 * pixel.y)) * 0.03125; + + gl_FragColor = sum; +} Added: main/trunk/data/shaders/gaussian6h.frag =================================================================== --- main/trunk/data/shaders/gaussian6h.frag (rev 0) +++ main/trunk/data/shaders/gaussian6h.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,21 @@ +uniform sampler2D tex; +uniform vec2 pixel; + +// Gaussian separated blur with radius 6. + +void main() +{ + vec4 sum = vec4(0.0); + float X = gl_TexCoord[0].x; + float Y = gl_TexCoord[0].y; + + sum += texture2D(tex, vec2(X - 5.13333 * pixel.x, Y)) * 0.00640869; + sum += texture2D(tex, vec2(X - 3.26667 * pixel.x, Y)) * 0.083313; + sum += texture2D(tex, vec2(X - 1.4 * pixel.x, Y)) * 0.305481; + sum += texture2D(tex, vec2(X, Y)) * 0.209473; + sum += texture2D(tex, vec2(X + 1.4 * pixel.x, Y)) * 0.305481; + sum += texture2D(tex, vec2(X + 3.26667 * pixel.x, Y)) * 0.083313; + sum += texture2D(tex, vec2(X + 5.13333 * pixel.x, Y)) * 0.00640869; + + gl_FragColor = sum; +} Added: main/trunk/data/shaders/gaussian6v.frag =================================================================== --- main/trunk/data/shaders/gaussian6v.frag (rev 0) +++ main/trunk/data/shaders/gaussian6v.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,21 @@ +uniform sampler2D tex; +uniform vec2 pixel; + +// Gaussian separated blur with radius 6. + +void main() +{ + vec4 sum = vec4(0.0); + float X = gl_TexCoord[0].x; + float Y = gl_TexCoord[0].y; + + sum += texture2D(tex, vec2(X, Y - 5.13333 * pixel.y)) * 0.00640869; + sum += texture2D(tex, vec2(X, Y - 3.26667 * pixel.y)) * 0.083313; + sum += texture2D(tex, vec2(X, Y - 1.4 * pixel.y)) * 0.305481; + sum += texture2D(tex, vec2(X, Y)) * 0.209473; + sum += texture2D(tex, vec2(X, Y + 1.4 * pixel.y)) * 0.305481; + sum += texture2D(tex, vec2(X, Y + 3.26667 * pixel.y)) * 0.083313; + sum += texture2D(tex, vec2(X, Y + 5.13333 * pixel.y)) * 0.00640869; + + gl_FragColor = sum; +} Added: main/trunk/data/shaders/glow.frag =================================================================== --- main/trunk/data/shaders/glow.frag (rev 0) +++ main/trunk/data/shaders/glow.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,16 @@ +uniform sampler2D tex; +uniform vec2 res; + +void main() +{ + vec2 coords = gl_FragCoord.xy / res; + + vec4 col = texture2D(tex, coords); + float alpha = col.a; + + if (alpha < 0.04) discard; + + col *= vec4(vec3(4.0), 1.5); + + gl_FragColor = col; +} Added: main/trunk/data/shaders/godfade.frag =================================================================== --- main/trunk/data/shaders/godfade.frag (rev 0) +++ main/trunk/data/shaders/godfade.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,16 @@ +uniform sampler2D tex; +uniform vec3 col; + +void main() +{ + vec4 res = texture2D(tex, gl_TexCoord[0].xy); + + // Keep the sun fully bright, but fade the sky + float mul = distance(res.xyz, col); + mul = step(mul, 0.02); + mul *= 0.97; + + res = res * vec4(mul); + + gl_FragColor = res; +} Added: main/trunk/data/shaders/godray.frag =================================================================== --- main/trunk/data/shaders/godray.frag (rev 0) +++ main/trunk/data/shaders/godray.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,29 @@ +uniform sampler2D tex; +uniform vec2 sunpos; + +#define SAMPLES 12 + +const float decaystep = 0.88; + +void main() +{ + vec2 texc = gl_TexCoord[0].xy; + vec2 tosun = sunpos - texc; + + if (dot(tosun, tosun) > 0.49) discard; + + vec2 dist = tosun * 1.0/(float(SAMPLES) * 1.12); + + vec3 col = texture2D(tex, texc).xyz; + float decay = 1.0; + + for (int i = 0; i < SAMPLES; i++) { + texc += dist; + vec3 here = texture2D(tex, texc).xyz; + here *= decay; + col += here; + decay *= decaystep; + } + + gl_FragColor = vec4(col, 1.0) * 0.8; +} Added: main/trunk/data/shaders/grass.frag =================================================================== --- main/trunk/data/shaders/grass.frag (rev 0) +++ main/trunk/data/shaders/grass.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,8 @@ +uniform sampler2D tex; + +void main() +{ + vec4 color = texture2D(tex, gl_TexCoord[0].st); + + gl_FragColor = color; +} Added: main/trunk/data/shaders/grass.vert =================================================================== --- main/trunk/data/shaders/grass.vert (rev 0) +++ main/trunk/data/shaders/grass.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,11 @@ +uniform vec3 windDir; + +void main() +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + + vec4 vertexPosition = gl_Vertex; + vertexPosition.xyz += windDir * gl_Color.r; + + gl_Position = gl_ModelViewProjectionMatrix * vertexPosition; +} Added: main/trunk/data/shaders/gum_shield.frag =================================================================== --- main/trunk/data/shaders/gum_shield.frag (rev 0) +++ main/trunk/data/shaders/gum_shield.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,38 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +// Jean-manuel clemencon (c) supertuxkart 2013 +// bubble gum shield +// TODO: Add a nice texture and soft edges when intersect with geometry + +uniform sampler2D tex; +uniform float transparency; + +varying vec2 uv; +varying vec3 eyeVec; +varying vec3 normal; + +void main() +{ + float inter = dot(normal, eyeVec); + float m = texture2D(tex, vec2(0.5, uv.y)).r; + inter = 1.0 - inter; + float alpha = inter + 1.0;// * m; + + gl_FragColor = vec4(0.8, 0.16, 0.48, alpha); +} Added: main/trunk/data/shaders/gum_shield.vert =================================================================== --- main/trunk/data/shaders/gum_shield.vert (rev 0) +++ main/trunk/data/shaders/gum_shield.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,41 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +// Jean-manuel clemencon (c) supertuxkart 2013 +// Creates a bubble gum shield effect +// --- +// TODO: The texture should reflect the strength of the shield, +// such that the user gets to know whether the shield has several +// "layers" or whether the shield is about to break. + +varying vec2 uv; +varying vec3 eyeVec; +varying vec3 normal; + +void main() +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + vec4 viewp = gl_ModelViewMatrix * gl_Vertex; + + eyeVec = normalize(-viewp).xyz; + normal = gl_NormalMatrix * gl_Normal; + + gl_Position = ftransform(); + + uv = gl_TexCoord[0].st; +} Added: main/trunk/data/shaders/lightbeam.frag =================================================================== --- main/trunk/data/shaders/lightbeam.frag (rev 0) +++ main/trunk/data/shaders/lightbeam.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,39 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +// Jean-manuel clemencon supertuxkart +// Creates a cone lightbeam effect by smoothing edges +// Original idea: http://udn.epicgames.com/Three/VolumetricLightbeamTutorial.html +// TODO: Soft edges when it intesects geometry +// Some artefacts are still visible + +uniform sampler2D tex; +uniform float transparency; + +varying vec2 uv; +varying vec3 eyeVec; +varying vec3 normal; + +void main() +{ + float inter = dot(normal, eyeVec); + float m = texture2D(tex, vec2(0.5, uv.y)).r; + float alpha = inter * inter * inter * inter * m; + + gl_FragColor = vec4(1.0, 1.0, 0.8, alpha); +} Added: main/trunk/data/shaders/lightbeam.vert =================================================================== --- main/trunk/data/shaders/lightbeam.vert (rev 0) +++ main/trunk/data/shaders/lightbeam.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,37 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +// Jean-manuel clemencon (C) Copyright supertuxkart +// Creates a cone lightbeam effect by smoothing edges + +varying vec2 uv; +varying vec3 eyeVec; +varying vec3 normal; + +void main() +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + vec4 viewp = gl_ModelViewMatrix * gl_Vertex; + + eyeVec = normalize(-viewp).xyz; + normal = gl_NormalMatrix * gl_Normal; + + gl_Position = ftransform(); + + uv = gl_TexCoord[0].st; +} Added: main/trunk/data/shaders/lightblend.frag =================================================================== --- main/trunk/data/shaders/lightblend.frag (rev 0) +++ main/trunk/data/shaders/lightblend.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,19 @@ +uniform sampler2D tex; +uniform vec3 ambient; +//uniform sampler2D spectex; + +void main() +{ + vec2 texc = gl_TexCoord[0].xy; + + vec4 col = texture2D(tex, texc); + //vec4 specular = texture2D(spectex, texc); + + col.xyz += ambient; + float spec = col.a - 0.05; + //spec *= specular.a; + col.xyz += spec * col.xyz; + col.a = 1.0; + + gl_FragColor = col; +} Added: main/trunk/data/shaders/mipviz.frag =================================================================== --- main/trunk/data/shaders/mipviz.frag (rev 0) +++ main/trunk/data/shaders/mipviz.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,52 @@ +#version 120 + +uniform sampler2D tex; +uniform vec2 texsize; +uniform int notex; + +float miplevel(in vec2 texture_coordinate) +{ + // The OpenGL Graphics System: A Specification 4.2 + // - chapter 3.9.11, equation 3.21 + + vec2 dx_vtc = dFdx(texture_coordinate); + vec2 dy_vtc = dFdy(texture_coordinate); + float delta_max_sqr = max(dot(dx_vtc, dx_vtc), dot(dy_vtc, dy_vtc)); + + return 0.5 * log2(delta_max_sqr); // == log2(sqrt(delta_max_sqr)); +} + +void main() { + + if (notex != 0) { + gl_FragColor = gl_Color; + return; + } + + // Buggy Intel windows driver workaround + vec4 levels[6] = vec4[]( + vec4(0.0, 0.0, 1.0, 0.8), + vec4(0.0, 0.5, 1.0, 0.4), + vec4(1.0, 1.0, 1.0, 0.0), + vec4(1.0, 0.7, 0.0, 0.2), + vec4(1.0, 0.3, 0.0, 0.6), + vec4(1.0, 0.0, 0.0, 0.8) + ); + + float mip = miplevel(texsize * gl_TexCoord[0].xy) + 2.0; + mip = clamp(mip, 0.0, 5.0); + + int lowmip = int(mip); + int highmip = lowmip + 1; + if (highmip > 5) + highmip = 5; + + float mixer = fract(mip); + + vec4 mixcol = mix(levels[lowmip], levels[highmip], mixer); + vec4 tcol = texture2D(tex, gl_TexCoord[0].xy); + + vec3 col = mix(tcol.xyz, mixcol.xyz, mixcol.a); + + gl_FragColor = vec4(col, tcol.a); +} Added: main/trunk/data/shaders/mlaa_blend2.frag =================================================================== --- main/trunk/data/shaders/mlaa_blend2.frag (rev 0) +++ main/trunk/data/shaders/mlaa_blend2.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,112 @@ +#define MAX_SEARCH_STEPS 8.0 +#define MAX_DISTANCE 33.0 + +#extension GL_ARB_shader_texture_lod: enable + +uniform sampler2D edgesMap; +uniform sampler2D areaMap; + +uniform vec2 PIXEL_SIZE; + +/** + * This one just returns the first level of a mip map chain, which allow us to + * avoid the nasty ddx/ddy warnings, even improving the performance a little + * bit. + */ +vec4 tex2Doffset(sampler2D map, vec2 texcoord, vec2 offset) { + return texture2DLod(map, texcoord + PIXEL_SIZE * offset, 0.0); +} + +float SearchXLeft(vec2 texcoord) { + // We compare with 0.9 to prevent bilinear access precision problems. + float i; + float e = 0.0; + for (i = -1.5; i > -2.0 * MAX_SEARCH_STEPS; i -= 2.0) { + e = tex2Doffset(edgesMap, texcoord, vec2(i, 0.0)).g; + if (e < 0.9) break; + } + return max(i + 1.5 - 2.0 * e, -2.0 * MAX_SEARCH_STEPS); +} + +float SearchXRight(vec2 texcoord) { + float i; + float e = 0.0; + for (i = 1.5; i < 2.0 * MAX_SEARCH_STEPS; i += 2.0) { + e = tex2Doffset(edgesMap, texcoord, vec2(i, 0.0)).g; + if (e < 0.9) break; + } + return min(i - 1.5 + 2.0 * e, 2.0 * MAX_SEARCH_STEPS); +} + +float SearchYDown(vec2 texcoord) { + float i; + float e = 0.0; + for (i = -1.5; i > -2.0 * MAX_SEARCH_STEPS; i -= 2.0) { + e = tex2Doffset(edgesMap, texcoord, vec2(i, 0.0).yx).r; + if (e < 0.9) break; + } + return max(i + 1.5 - 2.0 * e, -2.0 * MAX_SEARCH_STEPS); +} + +float SearchYUp(vec2 texcoord) { + float i; + float e = 0.0; + for (i = 1.5; i < 2.0 * MAX_SEARCH_STEPS; i += 2.0) { + e = tex2Doffset(edgesMap, texcoord, vec2(i, 0.0).yx).r; + if (e < 0.9) break; + } + return min(i - 1.5 + 2.0 * e, 2.0 * MAX_SEARCH_STEPS); +} + + +vec2 round(vec2 invec) { + return vec2(floor(abs(invec) + vec2(0.5)) * sign(invec)); +} + +vec2 Area(vec2 distance, float e1, float e2) { + // * By dividing by areaSize - 1.0 below we are implicitely offsetting to + // always fall inside of a pixel + // * Rounding prevents bilinear access precision problems + float areaSize = MAX_DISTANCE * 5.0; + vec2 pixcoord = MAX_DISTANCE * round(4.0 * vec2(e1, e2)) + distance; + vec2 texcoord = pixcoord / (areaSize - 1.0); + return texture2DLod(areaMap, texcoord, 0.0).ra; +} + +void main() { + vec4 areas = vec4(0.0); + + vec2 e = texture2D(edgesMap, gl_TexCoord[0].xy).rg; + + if (e.g != 0.0) { // Edge at north + + // Search distances to the left and to the right: + vec2 d = vec2(SearchXLeft(gl_TexCoord[0].xy), SearchXRight(gl_TexCoord[0].xy)); + + // Now fetch the crossing edges. Instead of sampling between edgels, we + // sample at 0.25, to be able to discern what value has each edgel: + vec4 coords = vec4(d.x, 0.25, d.y + 1.0, 0.25) * PIXEL_SIZE.xyxy + gl_TexCoord[0].xyxy; + float e1 = texture2DLod(edgesMap, coords.xy, 0.0).r; + float e2 = texture2DLod(edgesMap, coords.zw, 0.0).r; + + // Ok, we know how this pattern looks like, now it is time for getting + // the actual area: + areas.rg = Area(abs(d), e1, e2); + } + + if (e.r != 0.0) { // Edge at west + + // Search distances to the top and to the bottom: + vec2 d = vec2(SearchYUp(gl_TexCoord[0].xy), SearchYDown(gl_TexCoord[0].xy)); + + // Now fetch the crossing edges (yet again): + vec4 coords = vec4(-0.25, d.x, -0.25, d.y - 1.0) * PIXEL_SIZE.xyxy + gl_TexCoord[0].xyxy; + float e1 = texture2DLod(edgesMap, coords.xy, 0.0).g; + float e2 = texture2DLod(edgesMap, coords.zw, 0.0).g; + + // Get the area for this direction: + areas.ba = Area(abs(d), e1, e2); + } + + gl_FragColor = areas; +} Added: main/trunk/data/shaders/mlaa_color1.frag =================================================================== --- main/trunk/data/shaders/mlaa_color1.frag (rev 0) +++ main/trunk/data/shaders/mlaa_color1.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,25 @@ +varying vec4 offset[2]; + +uniform sampler2D colorMapG; +const float threshold = 0.1; + +void main() { + vec3 weights = vec3(0.2126,0.7152, 0.0722); // ITU-R BT. 709 + + /** + * Luma calculation requires gamma-corrected colors: + */ + float L = dot(texture2D(colorMapG, gl_TexCoord[0].xy).rgb, weights); + float Lleft = dot(texture2D(colorMapG, offset[0].xy).rgb, weights); + float Ltop = dot(texture2D(colorMapG, offset[0].zw).rgb, weights); + float Lright = dot(texture2D(colorMapG, offset[1].xy).rgb, weights); + float Lbottom = dot(texture2D(colorMapG, offset[1].zw).rgb, weights); + + vec4 delta = abs(vec4(L) - vec4(Lleft, Ltop, Lright, Lbottom)); + vec4 edges = step(vec4(threshold), delta); + + if (dot(edges, vec4(1.0)) == 0.0) + discard; + + gl_FragColor = edges; +} Added: main/trunk/data/shaders/mlaa_neigh3.frag =================================================================== --- main/trunk/data/shaders/mlaa_neigh3.frag (rev 0) +++ main/trunk/data/shaders/mlaa_neigh3.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,38 @@ +varying vec4 offset[2]; + +uniform sampler2D blendMap; +uniform sampler2D colorMap; + +void main() { + // Fetch the blending weights for current pixel: + vec4 topLeft = texture2D(blendMap, gl_TexCoord[0].xy); + float bottom = texture2D(blendMap, offset[1].zw).g; + float right = texture2D(blendMap, offset[1].xy).a; + vec4 a = vec4(topLeft.r, bottom, topLeft.b, right); + + // Up to 4 lines can be crossing a pixel (one in each edge). So, we perform + // a weighted average, where the weight of each line is 'a' cubed, which + // favors blending and works well in practice. + vec4 w = a * a * a; + + // There is some blending weight with a value greater than 0.0? + float sum = dot(w, vec4(1.0)); + if (sum < 1e-5) + discard; + + vec4 color = vec4(0.0); + + // Add the contributions of the possible 4 lines that can cross this pixel: + vec4 C = texture2D(colorMap, gl_TexCoord[0].xy); + vec4 Cleft = texture2D(colorMap, offset[0].xy); + vec4 Ctop = texture2D(colorMap, offset[0].zw); + vec4 Cright = texture2D(colorMap, offset[1].xy); + vec4 Cbottom = texture2D(colorMap, offset[1].zw); + color = mix(C, Ctop, a.r) * w.r + color; + color = mix(C, Cbottom, a.g) * w.g + color; + color = mix(C, Cleft, a.b) * w.b + color; + color = mix(C, Cright, a.a) * w.a + color; + + // Normalize the resulting color and we are finished! + gl_FragColor = color / sum; +} Added: main/trunk/data/shaders/mlaa_offset.vert =================================================================== --- main/trunk/data/shaders/mlaa_offset.vert (rev 0) +++ main/trunk/data/shaders/mlaa_offset.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,12 @@ +varying vec4 offset[2]; +uniform vec2 PIXEL_SIZE; + +void main() { + gl_Position = ftransform(); + vec4 invy = gl_MultiTexCoord0; +// invy.y = 1.0 - invy.y; + gl_TexCoord[0] = invy; + + offset[0] = invy.xyxy + PIXEL_SIZE.xyxy * vec4(-1.0, 0.0, 0.0, 1.0); + offset[1] = invy.xyxy + PIXEL_SIZE.xyxy * vec4( 1.0, 0.0, 0.0, -1.0); +} Added: main/trunk/data/shaders/motion_blur.frag =================================================================== --- main/trunk/data/shaders/motion_blur.frag (rev 0) +++ main/trunk/data/shaders/motion_blur.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,84 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +// motion_blur.frag + +// The actual boost amount (which linearly scales the blur to be shown). +// should be in the range [0.0, 1.0], though a larger value might make +// the blurring too string. Atm we are using [0, 0.5]. +uniform float boost_amount; + +// The color buffer to use. +uniform sampler2D color_buffer; + +// Center (in texture coordinates) at which the kart is. A small circle +// around this center is not blurred (see mask_radius below) +uniform vec2 center; + +// The direction to which the blurring aims at +uniform vec2 direction; + +// Radius of mask around the character in which no blurring happens +// so that the kart doesn't get blurred. +uniform float mask_radius; + +// Maximum height of texture used +uniform float max_tex_height; + +// Number of samples used for blurring +#define NB_SAMPLES 8 + +void main() +{ + vec2 texcoords = gl_TexCoord[0].st; + + // Sample the color buffer + vec3 color = texture2D(color_buffer, texcoords).rgb; + + // Compute the blur direction. + // IMPORTANT: we don't normalize it so that it avoids a glitch around 'center', + // plus it naturally scales the motion blur in a cool way :) + vec2 blur_dir = direction - texcoords; + + // Compute the blurring factor: + // - apply the mask, i.e. no blurring in a small circle around the kart + float blur_factor = max(0.0, length(texcoords - center) - mask_radius); + + // - avoid blurring the top of the screen + blur_factor *= (max_tex_height - texcoords.t); + + // - apply the boost amount + blur_factor *= boost_amount; + + // Scale the blur direction + blur_dir *= blur_factor; + + // Compute the blur + vec2 inc_vec = blur_dir / vec2(NB_SAMPLES); + vec2 blur_texcoords = texcoords + inc_vec; + for(int i=1 ; i < NB_SAMPLES ; i++) + { + color += texture2D(color_buffer, blur_texcoords).rgb; + blur_texcoords += inc_vec; + } + color /= vec3(NB_SAMPLES); + gl_FragColor = vec4(color, 1.0); + + // Keep this commented line for debugging: + //gl_FragColor = vec4(blur_factor, blur_factor, blur_factor, 0.0); +} Added: main/trunk/data/shaders/motion_blur.vert =================================================================== --- main/trunk/data/shaders/motion_blur.vert (rev 0) +++ main/trunk/data/shaders/motion_blur.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,25 @@ +// SuperTuxKart - a fun racing game with go-kart +// Copyright (C) 2013 the SuperTuxKart team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 3 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +// motion_blur.vert + +void main() +{ + gl_TexCoord[0].st = vec2(gl_MultiTexCoord0.s, gl_MultiTexCoord0.t); + gl_Position = gl_Vertex; +} Added: main/trunk/data/shaders/multiply.frag =================================================================== --- main/trunk/data/shaders/multiply.frag (rev 0) +++ main/trunk/data/shaders/multiply.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,10 @@ +uniform sampler2D tex1; +uniform sampler2D tex2; + +void main() +{ + vec4 col1 = texture2D(tex1, gl_TexCoord[0].xy); + vec4 col2 = vec4(vec3(texture2D(tex2, gl_TexCoord[0].xy).x), 1.0); + + gl_FragColor = col1 * col2; +} Added: main/trunk/data/shaders/normalmap.frag =================================================================== --- main/trunk/data/shaders/normalmap.frag (rev 0) +++ main/trunk/data/shaders/normalmap.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,36 @@ +// Shader based on work by Fabien Sanglard +// Released under the terms of CC-BY 3.0 + +uniform sampler2D BumpTex; //The bump-map +uniform sampler2D DecalTex; //The texture +uniform sampler2D LightMapTex; +uniform int HasLightMap; + +// New bumpmapping +varying vec3 lightVec; +varying vec3 halfVec; +varying vec3 eyeVec; + + +void main() +{ + // lookup normal from normal map, move from [0,1] to [-1, 1] range, normalize + vec3 normal = 2.0 * texture2D (BumpTex, gl_TexCoord[0].st).rgb - 1.0; + normal = normalize (normal); + + // compute diffuse lighting + float lamberFactor = max (dot (lightVec, normal), 0.0); + vec4 diffuseMaterial; + + diffuseMaterial = texture2D (DecalTex, gl_TexCoord[0].st); + + if (HasLightMap < 1) + { + // 0.5 is the ambient light + gl_FragColor = diffuseMaterial * (0.5 + lamberFactor*0.5); + } + else + { + gl_FragColor = diffuseMaterial * (0.5 + lamberFactor*0.5) * texture2D(LightMapTex, gl_TexCoord[0].st); + } +} Added: main/trunk/data/shaders/normalmap.vert =================================================================== --- main/trunk/data/shaders/normalmap.vert (rev 0) +++ main/trunk/data/shaders/normalmap.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,54 @@ +// Shader based on work by Fabien Sanglard +// Released under the terms of CC-BY 3.0 + +varying vec3 lightVec; +varying vec3 halfVec; +varying vec3 eyeVec; + +uniform vec3 lightdir; + +void main() +{ + + gl_TexCoord[0] = gl_MultiTexCoord0; + + // Building the matrix Eye Space -> Tangent Space + vec3 n = normalize (gl_NormalMatrix * gl_Normal); + vec3 t = normalize (gl_NormalMatrix * gl_MultiTexCoord1.xyz); // tangent + vec3 b = cross (n, t); + + vec3 vertexPosition = vec3(gl_ModelViewMatrix * gl_Vertex); + + // transform light and half angle vectors by tangent basis + vec3 v; + v.x = dot (lightdir, t); + v.y = dot (lightdir, b); + v.z = dot (lightdir, n); + lightVec = normalize (v); + + + v.x = dot (vertexPosition, t); + v.y = dot (vertexPosition, b); + v.z = dot (vertexPosition, n); + eyeVec = normalize (v); + + + vertexPosition = normalize(vertexPosition); + + // Normalize the halfVector to pass it to the fragment shader + + // No need to divide by two, the result is normalized anyway. + // vec3 halfVector = normalize((vertexPosition + lightDir) / 2.0); + vec3 halfVector = normalize(vertexPosition + lightdir); + v.x = dot (halfVector, t); + v.y = dot (halfVector, b); + v.z = dot (halfVector, n); + + // No need to normalize, t,b,n and halfVector are normal vectors. + //normalize (v); + halfVec = v ; + + + gl_Position = ftransform(); + +} \ No newline at end of file Added: main/trunk/data/shaders/objectpass.frag =================================================================== --- main/trunk/data/shaders/objectpass.frag (rev 0) +++ main/trunk/data/shaders/objectpass.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,40 @@ +varying vec3 nor; + +uniform sampler2D tex; +uniform sampler2D lighttex; +uniform float far; +uniform int hastex; +uniform int haslightmap; +uniform float objectid; + +const float near = 1.0; + +vec4 encdepth(float v) { + vec4 enc = vec4(1.0, 255.0, 65025.0, 16581375.0) * v; + enc = fract(enc); + enc -= enc.yzww * vec4(1.0/255.0, 1.0/255.0, 1.0/255.0, 0.0); + return enc; +} + +void main() { + + float linear_z = (2.0 * near) / (far + near - gl_FragCoord.z * (far - near)); + + // Tune for better inside range without losing outdoors + linear_z *= 2.0; + + vec4 light = vec4(1.0); + + if (haslightmap != 0) { + light = texture2D(lighttex, gl_TexCoord[1].xy); + } + + if (hastex != 0) + gl_FragData[0] = texture2D(tex, gl_TexCoord[0].xy) * light; + else + gl_FragData[0] = gl_Color; + + gl_FragData[1] = vec4(nor, linear_z); + gl_FragData[2] = vec4(encdepth(gl_FragCoord.z).xyz, objectid); +} + Added: main/trunk/data/shaders/objectpass.vert =================================================================== --- main/trunk/data/shaders/objectpass.vert (rev 0) +++ main/trunk/data/shaders/objectpass.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,14 @@ +varying vec3 nor; +uniform mat4 invtworldm; + +void main() { + + nor = (invtworldm * vec4(gl_Normal, 0.0)).xyz; + nor = normalize(nor); + nor = nor * 0.5 + 0.5; + + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_TexCoord[1] = gl_MultiTexCoord1; + gl_Position = ftransform(); + gl_FrontColor = gl_Color; +} Added: main/trunk/data/shaders/objectpass_ref.frag =================================================================== --- main/trunk/data/shaders/objectpass_ref.frag (rev 0) +++ main/trunk/data/shaders/objectpass_ref.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,37 @@ +varying vec3 nor; +uniform sampler2D tex; +uniform float far; +uniform int hastex; +uniform float objectid; + +const float near = 1.0; + +vec4 encdepth(float v) { + vec4 enc = vec4(1.0, 255.0, 65025.0, 16581375.0) * v; + enc = fract(enc); + enc -= enc.yzww * vec4(1.0/255.0, 1.0/255.0, 1.0/255.0, 0.0); + return enc; +} + +void main() { + + float linear_z = (2.0 * near) / (far + near - gl_FragCoord.z * (far - near)); + + // Tune for better inside range without losing outdoors + linear_z *= 2.0; + + if (hastex != 0) { + vec4 col = texture2D(tex, gl_TexCoord[0].xy); + + if (col.a < 0.5) + discard; + + gl_FragData[0] = col; + } else { + gl_FragData[0] = gl_Color; + } + + gl_FragData[1] = vec4(nor, linear_z); + gl_FragData[2] = vec4(encdepth(gl_FragCoord.z).xyz, objectid); +} + Added: main/trunk/data/shaders/objectpass_rimlit.frag =================================================================== --- main/trunk/data/shaders/objectpass_rimlit.frag (rev 0) +++ main/trunk/data/shaders/objectpass_rimlit.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,45 @@ +varying vec3 nor; +uniform sampler2D tex; +uniform float far; +uniform int hastex; +uniform float objectid; + +varying vec3 eyenor; +varying vec3 viewpos; + +const float near = 1.0; + +vec4 encdepth(float v) { + vec4 enc = vec4(1.0, 255.0, 65025.0, 16581375.0) * v; + enc = fract(enc); + enc -= enc.yzww * vec4(1.0/255.0, 1.0/255.0, 1.0/255.0, 0.0); + return enc; +} + +void main() { + + float linear_z = (2.0 * near) / (far + near - gl_FragCoord.z * (far - near)); + + // Tune for better inside range without losing outdoors + linear_z *= 2.0; + + float rim = 1.0 - dot(eyenor, viewpos); + rim = smoothstep(0.5, 1.5, rim) * 0.35; + + if (hastex != 0) { + vec4 col = texture2D(tex, gl_TexCoord[0].xy); + + if (col.a < 0.5) + discard; + + col.xyz += rim; + + gl_FragData[0] = col; + } else { + gl_FragData[0] = gl_Color + vec4(vec3(rim), 0.0); + } + + gl_FragData[1] = vec4(nor, linear_z); + gl_FragData[2] = vec4(encdepth(gl_FragCoord.z).xyz, objectid); +} + Added: main/trunk/data/shaders/objectpass_rimlit.vert =================================================================== --- main/trunk/data/shaders/objectpass_rimlit.vert (rev 0) +++ main/trunk/data/shaders/objectpass_rimlit.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,19 @@ +varying vec3 nor; +uniform mat4 invtworldm; + +varying vec3 eyenor; +varying vec3 viewpos; + +void main() { + + nor = (invtworldm * vec4(gl_Normal, 0.0)).xyz; + nor = normalize(nor); + nor = nor * 0.5 + 0.5; + + eyenor = gl_NormalMatrix * gl_Normal; + viewpos = -normalize((gl_ModelViewMatrix * gl_Vertex).xyz); + + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_Position = ftransform(); + gl_FrontColor = gl_Color; +} Added: main/trunk/data/shaders/objectpass_spheremap.frag =================================================================== --- main/trunk/data/shaders/objectpass_spheremap.frag (rev 0) +++ main/trunk/data/shaders/objectpass_spheremap.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,42 @@ +varying vec3 nor; +uniform sampler2D tex; +uniform float far; +uniform float objectid; + +varying vec3 eyenor; +varying vec3 viewpos; + +const float near = 1.0; + +vec4 encdepth(float v) { + vec4 enc = vec4(1.0, 255.0, 65025.0, 16581375.0) * v; + enc = fract(enc); + enc -= enc.yzww * vec4(1.0/255.0, 1.0/255.0, 1.0/255.0, 0.0); + return enc; +} + +void main() { + + float linear_z = (2.0 * near) / (far + near - gl_FragCoord.z * (far - near)); + + // Tune for better inside range without losing outdoors + linear_z *= 2.0; + + // Calculate the spherical UV + const vec3 forward = vec3(0.0, 0.0, 1.0); + + // get the angle between the forward vector and the horizontal portion of the normal + vec3 normal_x = normalize(vec3(eyenor.x, 0.0, eyenor.z)); + float sin_theta_x = length(cross( forward, normal_x )) * eyenor.x/abs(eyenor.x); + + // get the angle between the forward vector and the vertical portion of the normal + vec3 normal_y = normalize(vec3(0.0, eyenor.y, eyenor.z)); + float sin_theta_y = length(cross( forward, normal_y )) * eyenor.y/abs(eyenor.y); + + vec4 detail0 = texture2D(tex, vec2(0.5 + sin_theta_x*0.5, 0.5 + sin_theta_y*0.5)); + + gl_FragData[0] = detail0 * gl_Color; + + gl_FragData[1] = vec4(nor, linear_z); + gl_FragData[2] = vec4(encdepth(gl_FragCoord.z).xyz, objectid); +} Added: main/trunk/data/shaders/pass.frag =================================================================== --- main/trunk/data/shaders/pass.frag (rev 0) +++ main/trunk/data/shaders/pass.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,6 @@ +uniform sampler2D tex; + +void main() +{ + gl_FragColor = texture2D(tex, gl_TexCoord[0].xy); +} Added: main/trunk/data/shaders/pass.vert =================================================================== --- main/trunk/data/shaders/pass.vert (rev 0) +++ main/trunk/data/shaders/pass.vert 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,6 @@ +void main() { + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_TexCoord[1] = gl_MultiTexCoord1; + gl_Position = ftransform(); + gl_FrontColor = gl_Color; +} Added: main/trunk/data/shaders/penumbrah.frag =================================================================== --- main/trunk/data/shaders/penumbrah.frag (rev 0) +++ main/trunk/data/shaders/penumbrah.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,52 @@ +uniform sampler2D tex; +uniform vec2 pixel; + +// Separated penumbra, horizontal + +void main() +{ + float sum = 0.0; + vec4 tmp; + float X = gl_TexCoord[0].x; + float Y = gl_TexCoord[0].y; + float width = 0.0; + float zsum = 0.00001; + + tmp = texture2D(tex, vec2(X - 5.13333 * pixel.x, Y)); + sum += tmp.x * 0.00640869; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X - 3.26667 * pixel.x, Y)); + sum += tmp.x * 0.083313; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X - 1.4 * pixel.x, Y)); + sum += tmp.x * 0.305481; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X, Y)); + sum += tmp.x * 0.209473; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X + 1.4 * pixel.x, Y)); + sum += tmp.x * 0.305481; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X + 3.26667 * pixel.x, Y)); + sum += tmp.x * 0.083313; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X + 5.13333 * pixel.x, Y)); + sum += tmp.x * 0.00640869; + zsum += tmp.z; + width += tmp.y; + + float hasz = step(0.7, zsum); + gl_FragColor = vec4(sum, (width / zsum) * hasz, hasz, 1.0); +} Added: main/trunk/data/shaders/penumbrav.frag =================================================================== --- main/trunk/data/shaders/penumbrav.frag (rev 0) +++ main/trunk/data/shaders/penumbrav.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,52 @@ +uniform sampler2D tex; +uniform vec2 pixel; + +// Separated penumbra, vertical + +void main() +{ + float sum = 0.0; + vec4 tmp; + float X = gl_TexCoord[0].x; + float Y = gl_TexCoord[0].y; + float width = 0.0; + float zsum = 0.00001; + + tmp = texture2D(tex, vec2(X, Y - 5.13333 * pixel.y)); + sum += tmp.x * 0.00640869; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X, Y - 3.26667 * pixel.y)); + sum += tmp.x * 0.083313; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X, Y - 1.4 * pixel.y)); + sum += tmp.x * 0.305481; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X, Y)); + sum += tmp.x * 0.209473; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X, Y + 1.4 * pixel.y)); + sum += tmp.x * 0.305481; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X, Y + 3.26667 * pixel.y)); + sum += tmp.x * 0.083313; + zsum += tmp.z; + width += tmp.y; + + tmp = texture2D(tex, vec2(X, Y + 5.13333 * pixel.y)); + sum += tmp.x * 0.00640869; + zsum += tmp.z; + width += tmp.y; + + float hasz = step(0.7, zsum); + gl_FragColor = vec4(sum, (width / zsum) * hasz, hasz, 1.0); +} Added: main/trunk/data/shaders/pointlight.frag =================================================================== --- main/trunk/data/shaders/pointlight.frag (rev 0) +++ main/trunk/data/shaders/pointlight.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,50 @@ +uniform sampler2D ntex; +uniform sampler2D dtex; + +uniform vec3 center; +uniform vec3 col; +uniform vec3 campos; +uniform float r; +uniform float spec; +uniform vec2 screen; +uniform mat4 invprojview; + +float decdepth(vec4 rgba) { + return dot(rgba, vec4(1.0, 1.0/255.0, 1.0/65025.0, 1.0/16581375.0)); +} + +void main() { + + vec2 texc = gl_FragCoord.xy / screen; + float z = decdepth(vec4(texture2D(dtex, texc).xyz, 0.0)); + + if (z < 0.03) discard; + + vec3 tmp = vec3(texc, z); + tmp = tmp * 2.0 - 1.0; + + vec4 xpos = vec4(tmp, 1.0); + xpos = invprojview * xpos; + xpos.xyz /= xpos.w; + + float d = distance(center, xpos.xyz); + if (d > r) discard; + + float att = 1.0 - smoothstep(0.0, r, d); + + vec3 norm = texture2D(ntex, texc).xyz; + norm = (norm - 0.5) * 2.0; + + vec3 camdir = normalize(campos - xpos.xyz); + + vec3 L = normalize(center - xpos.xyz); + vec3 H = normalize(L + camdir); + + float NdotL = max(0.0, dot(norm, L)) * att; + if (NdotL < 0.01) discard; + float NdotH = max(0.0, dot(norm, H)); + NdotH = pow(NdotH, spec); + NdotH += 0.05; // offset so that the alpha test doesn't kill us + + gl_FragColor = NdotL * vec4(col, NdotH); +} Added: main/trunk/data/shaders/ppdisplace.frag =================================================================== --- main/trunk/data/shaders/ppdisplace.frag (rev 0) +++ main/trunk/data/shaders/ppdisplace.frag 2013-12-09 13:11:09 UTC (rev 14686) @@ -0,0 +1,26 @@ +uniform sampler2D tex; +uniform sampler2D dtex; + +uniform int viz; + +void main() +{ + vec2 tc = gl_TexCoord[0].xy; + + vec4 shiftval = texture2D(dtex, tc) / vec4(50.0); + vec2 shift; + shift.x = -shiftval.x + shiftval.y; + shift.y = -shiftval.z + shiftval.w; + + tc += shift; + + vec4 newcol = texture2D(tex, tc); + + if (viz < 1) + { + gl_FragColor = newcol; + } else + { + gl_FragColor = shiftval * vec4(50.0); + } +} Added: mai... [truncated message content] |
From: <vin...@us...> - 2013-12-24 01:59:39
|
Revision: 14770 http://sourceforge.net/p/supertuxkart/code/14770 Author: vincentlj Date: 2013-12-24 01:59:35 +0000 (Tue, 24 Dec 2013) Log Message: ----------- Test commit, to be reverted Modified Paths: -------------- main/trunk/data/shaders/lightblend.frag main/trunk/data/tracks/20_harvest/scene.xml Modified: main/trunk/data/shaders/lightblend.frag =================================================================== --- main/trunk/data/shaders/lightblend.frag 2013-12-24 01:44:40 UTC (rev 14769) +++ main/trunk/data/shaders/lightblend.frag 2013-12-24 01:59:35 UTC (rev 14770) @@ -11,5 +11,5 @@ vec3 specular = texture2D(diffuse_and_spec, texc).www; float ao = texture2D(ambient_occlusion, texc).x; - gl_FragColor = vec4(diffuse + specular + ao * ambient, 1.0); + gl_FragColor = vec4(diffuse + ao * ambient, 1.0); } Modified: main/trunk/data/tracks/20_harvest/scene.xml =================================================================== --- main/trunk/data/tracks/20_harvest/scene.xml 2013-12-24 01:44:40 UTC (rev 14769) +++ main/trunk/data/tracks/20_harvest/scene.xml 2013-12-24 01:59:35 UTC (rev 14770) @@ -1,66 +1,66 @@ -<?xml version="1.0"?> -<!-- Generated with script from SVN rev 14634 --> -<scene> - <track model="farm_track.b3d" x="0" y="0" z="0"/> - <object type="animation" xyz="11.00 1.61 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="static" shape="box" model="SomeModel.b3d" displacing="true"> - </object> - <object type="animation" xyz="0.00 0.50 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="SomeModel.b3d" renderpass="skybox"> - </object> - <sun xyz="0.00 473.63 1689.11" sun-specular="167 167 167" sun-diffuse="235 180 110" ambient="103 99 86"/> - <sky-color rgb="77 104 255"/> - <sky-box texture="sky.png sky.png sky.png sky.png sky.png sky.png"/> - <camera far="500.0"/> - <checks> - <check-lap kind="lap" same-group="0" other-ids="1" /> - <check-line kind="activate" other-ids="2" p1="123.17 48.42" p2="167.90 93.77" - min-height="1.52" same-group="1"/> - <check-line kind="activate" other-ids="0" p1="65.87 -162.54" p2="49.31 -122.74" - min-height="6.84" same-group="2"/> - </checks> - <particle-emitter kind="fire.xml" xyz="11.04 1.61 -0.06" h="0.00"> - </particle-emitter> - <particle-emitter kind="black_smoke.xml" xyz="11.05 1.62 0.03" h="0.00"> - </particle-emitter> - <banana x="55.81" y="10.20" z="-53.41" /> - <banana x="-60.66" y="10.20" z="-80.51" /> - <banana x="-55.32" y="10.20" z="-84.30" /> - <banana x="-1.21" y="10.20" z="-45.36" /> - <banana x="2.47" y="10.20" z="-45.36" /> - <banana x="40.14" y="10.20" z="54.01" /> - <banana x="139.86" y="10.20" z="80.94" /> - <banana x="138.79" y="10.20" z="75.93" /> - <banana x="100.36" y="10.20" z="-21.73" /> - <banana x="100.72" y="10.20" z="-26.22" /> - <big-nitro x="56.82" y="10.20" z="-51.14" /> - <big-nitro x="-1.36" y="10.20" z="-42.19" /> - <big-nitro x="2.42" y="10.20" z="-42.19" /> - <item x="70.35" y="10.20" z="-123.05" /> - <item x="73.61" y="10.20" z="-123.57" /> - <item x="76.56" y="10.20" z="-123.83" /> - <item x="-7.86" y="10.20" z="-118.80" /> - <item x="-7.27" y="10.20" z="-124.22" /> - <item x="-21.41" y="10.20" z="-69.16" /> - <item x="-2.50" y="10.20" z="30.10" /> - <item x="3.18" y="10.20" z="30.10" /> - <item x="149.47" y="10.20" z="32.85" /> - <item x="154.46" y="10.20" z="28.84" /> - <small-nitro x="53.31" y="10.20" z="-51.03" /> - <small-nitro x="59.09" y="10.20" z="-53.71" /> - <small-nitro x="-7.86" y="10.20" z="-121.90" /> - <small-nitro x="-59.76" y="10.20" z="-107.65" /> - <small-nitro x="-56.86" y="10.20" z="-106.38" /> - <small-nitro x="-54.41" y="10.20" z="-105.11" /> - <small-nitro x="-22.07" y="10.20" z="-66.41" /> - <small-nitro x="-21.12" y="10.20" z="-72.65" /> - <small-nitro x="0.21" y="10.20" z="29.59" /> - <small-nitro x="73.96" y="10.20" z="75.46" /> - <small-nitro x="74.92" y="10.20" z="73.25" /> - <small-nitro x="76.36" y="10.20" z="70.93" /> - <small-nitro x="153.65" y="10.20" z="32.20" /> - <small-nitro x="149.03" y="10.20" z="28.48" /> - <light xyz="0.00 0.00 0.00" distance="25.00" color="0 67 255"/> - <default-start karts-per-row ="3" - forwards-distance ="1.50" - sidewards-distance="3.00" - upwards-distance ="0.10"/> -</scene> +<?xml version="1.0"?> +<!-- Generated with script from SVN rev 14634 --> +<scene> + <track model="farm_track.b3d" x="0" y="0" z="0"/> + <object type="animation" xyz="11.00 1.61 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="static" shape="box" model="SomeModel.b3d" displacing="true"> + </object> + <object type="animation" xyz="0.00 0.50 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="SomeModel.b3d" renderpass="skybox"> + </object> + <sun xyz="0.00 473.63 1689.11" sun-specular="0 0 0" sun-diffuse="0 0 0" ambient="0 0 0"/> + <sky-color rgb="77 104 255"/> + <sky-box texture="sky.png sky.png sky.png sky.png sky.png sky.png"/> + <camera far="500.0"/> + <checks> + <check-lap kind="lap" same-group="0" other-ids="1" /> + <check-line kind="activate" other-ids="2" p1="123.17 48.42" p2="167.90 93.77" + min-height="1.52" same-group="1"/> + <check-line kind="activate" other-ids="0" p1="65.87 -162.54" p2="49.31 -122.74" + min-height="6.84" same-group="2"/> + </checks> + <particle-emitter kind="fire.xml" xyz="11.04 1.61 -0.06" h="0.00"> + </particle-emitter> + <particle-emitter kind="black_smoke.xml" xyz="11.05 1.62 0.03" h="0.00"> + </particle-emitter> + <banana x="55.81" y="10.20" z="-53.41" /> + <banana x="-60.66" y="10.20" z="-80.51" /> + <banana x="-55.32" y="10.20" z="-84.30" /> + <banana x="-1.21" y="10.20" z="-45.36" /> + <banana x="2.47" y="10.20" z="-45.36" /> + <banana x="40.14" y="10.20" z="54.01" /> + <banana x="139.86" y="10.20" z="80.94" /> + <banana x="138.79" y="10.20" z="75.93" /> + <banana x="100.36" y="10.20" z="-21.73" /> + <banana x="100.72" y="10.20" z="-26.22" /> + <big-nitro x="56.82" y="10.20" z="-51.14" /> + <big-nitro x="-1.36" y="10.20" z="-42.19" /> + <big-nitro x="2.42" y="10.20" z="-42.19" /> + <item x="70.35" y="10.20" z="-123.05" /> + <item x="73.61" y="10.20" z="-123.57" /> + <item x="76.56" y="10.20" z="-123.83" /> + <item x="-7.86" y="10.20" z="-118.80" /> + <item x="-7.27" y="10.20" z="-124.22" /> + <item x="-21.41" y="10.20" z="-69.16" /> + <item x="-2.50" y="10.20" z="30.10" /> + <item x="3.18" y="10.20" z="30.10" /> + <item x="149.47" y="10.20" z="32.85" /> + <item x="154.46" y="10.20" z="28.84" /> + <small-nitro x="53.31" y="10.20" z="-51.03" /> + <small-nitro x="59.09" y="10.20" z="-53.71" /> + <small-nitro x="-7.86" y="10.20" z="-121.90" /> + <small-nitro x="-59.76" y="10.20" z="-107.65" /> + <small-nitro x="-56.86" y="10.20" z="-106.38" /> + <small-nitro x="-54.41" y="10.20" z="-105.11" /> + <small-nitro x="-22.07" y="10.20" z="-66.41" /> + <small-nitro x="-21.12" y="10.20" z="-72.65" /> + <small-nitro x="0.21" y="10.20" z="29.59" /> + <small-nitro x="73.96" y="10.20" z="75.46" /> + <small-nitro x="74.92" y="10.20" z="73.25" /> + <small-nitro x="76.36" y="10.20" z="70.93" /> + <small-nitro x="153.65" y="10.20" z="32.20" /> + <small-nitro x="149.03" y="10.20" z="28.48" /> + <light xyz="0.00 0.00 0.00" distance="25.00" color="255 255 255"/> + <default-start karts-per-row ="3" + forwards-distance ="1.50" + sidewards-distance="3.00" + upwards-distance ="0.10"/> +</scene> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sam...@us...> - 2013-12-27 02:06:12
|
Revision: 14803 http://sourceforge.net/p/supertuxkart/code/14803 Author: samuncle Date: 2013-12-27 02:06:08 +0000 (Fri, 27 Dec 2013) Log Message: ----------- Allow kart to use specular map Modified Paths: -------------- main/trunk/data/karts/sara/greenTextile.png main/trunk/data/karts/sara/new_panties.png main/trunk/data/shaders/objectpass_rimlit.frag Modified: main/trunk/data/karts/sara/greenTextile.png =================================================================== (Binary files differ) Modified: main/trunk/data/karts/sara/new_panties.png =================================================================== (Binary files differ) Modified: main/trunk/data/shaders/objectpass_rimlit.frag =================================================================== --- main/trunk/data/shaders/objectpass_rimlit.frag 2013-12-27 01:00:20 UTC (rev 14802) +++ main/trunk/data/shaders/objectpass_rimlit.frag 2013-12-27 02:06:08 UTC (rev 14803) @@ -15,7 +15,7 @@ if (hastex != 0) { vec4 col = texture2D(tex, gl_TexCoord[0].xy); - if (col.a < 0.5) + if (col.a < 0.1) discard; col.xyz += rim; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2014-01-01 18:20:55
|
Revision: 14871 http://sourceforge.net/p/supertuxkart/code/14871 Author: auria Date: 2014-01-01 18:20:51 +0000 (Wed, 01 Jan 2014) Log Message: ----------- Add Krobonil's new song for lighthouse Modified Paths: -------------- main/trunk/data/tracks/lighthouse/scene.xml main/trunk/data/tracks/lighthouse/track.xml Added Paths: ----------- main/trunk/data/music/klabauter_dance.music main/trunk/data/music/klabauter_dance.ogg Added: main/trunk/data/music/klabauter_dance.music =================================================================== --- main/trunk/data/music/klabauter_dance.music (rev 0) +++ main/trunk/data/music/klabauter_dance.music 2014-01-01 18:20:51 UTC (rev 14871) @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<music title = "Klabauter Dance" + composer = "Krobonil" + gain = "1.0" + file = "klabauter_dance.ogg"/> Added: main/trunk/data/music/klabauter_dance.ogg =================================================================== (Binary files differ) Index: main/trunk/data/music/klabauter_dance.ogg =================================================================== --- main/trunk/data/music/klabauter_dance.ogg 2014-01-01 18:11:28 UTC (rev 14870) +++ main/trunk/data/music/klabauter_dance.ogg 2014-01-01 18:20:51 UTC (rev 14871) Property changes on: main/trunk/data/music/klabauter_dance.ogg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: main/trunk/data/tracks/lighthouse/scene.xml =================================================================== --- main/trunk/data/tracks/lighthouse/scene.xml 2014-01-01 18:11:28 UTC (rev 14870) +++ main/trunk/data/tracks/lighthouse/scene.xml 2014-01-01 18:20:51 UTC (rev 14871) @@ -1,371 +1,381 @@ -<?xml version="1.0"?> -<!-- Generated with script from SVN rev 14634 --> -<scene> - <track model="lighthouse-terrain_track.b3d" x="0" y="0" z="0"> - <static-object model="vineUnderCave.b3d" xyz="-86.86 -17.34 -87.70" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object model="bigTerrainChunk.b3d" xyz="220.85 16.34 -41.59" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_distance="70.0" lod_group="pine_tree_lod" model="pine_tree_lod_hight.b3d" xyz="270.46 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> - <static-object model="lightWindows.b3d" xyz="-158.20 55.48 -63.22" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="102.39 -11.20 -15.52" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-96.85 -8.65 -29.26" hpr="0.0 -0.0 0.0" scale="2.71 2.71 2.71"/> - <static-object lod_distance="150.0" lod_group="pine_tree_lod" model="pine_tree_lod_medium.b3d" xyz="293.33 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> - <static-object lod_distance="300.0" lod_group="pine_tree_lod" model="pine_tree_lod_low.b3d" xyz="309.45 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-47.61 -12.51 33.26" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -8.10 -4.66" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -6.11 16.29" hpr="0.0 30.7 0.0" scale="3.17 3.17 3.17"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="66.09 -11.20 -92.83" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="116.99 -11.20 -5.45" hpr="0.0 21.7 0.0" scale="1.81 1.81 1.81"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="117.67 -11.20 -33.35" hpr="0.0 -77.7 0.0" scale="2.38 2.38 2.38"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-117.71 -6.11 30.54" hpr="0.0 -75.4 0.0" scale="3.17 3.17 3.17"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-97.58 -11.46 36.36" hpr="-0.0 -106.1 -0.0" scale="2.29 2.29 2.29"/> - <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-77.01 -11.87 36.36" hpr="-0.0 -106.1 -0.0" scale="2.68 2.68 2.68"/> - <static-object lod_distance="150.0" lod_group="miniLamp" model="miniLampPost_low.b3d" xyz="-156.19 3.73 -49.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_distance="60.0" lod_group="grass_chunk" model="grass_chunk_hight.b3d" xyz="266.88 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_distance="100.0" lod_group="grass_chunk" model="grass_chunk_low.b3d" xyz="266.88 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="99.38 -16.17 -18.46" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="106.39 -15.64 -18.46" hpr="-0.0 -0.0 0.5" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="102.42 -16.06 -12.81" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.30 -14.44 -25.77" hpr="19.0 -0.6 1.9" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.63 -14.41 -33.94" hpr="-9.9 0.3 1.9" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-101.33 -14.32 -29.38" hpr="-2.8 -2.3 12.3" scale="0.71 0.71 0.71"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.11 -17.10 30.07" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-44.92 -17.10 28.91" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-52.93 -17.10 33.59" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.30 -17.10 33.77" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> - <static-object model="dynamicSky.b3d" xyz="-45.36 251.46 102.38" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"> - <animated-texture name="dynamic_clouds.png" dx="0.050" dy="0.010" /> - </static-object> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 3.24" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 -6.38" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="9.45 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-4.79 -17.10 -1.93" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-1.28 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="5.77 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-35.87 -13.28 -72.96" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.04 -13.28 -66.25" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-36.40 -13.28 -62.03" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.74 -13.28 -76.46" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.39 -13.28 -70.38" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-29.23 -12.41 -67.42" hpr="-12.5 69.5 -10.2" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="68.79 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="61.74 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="58.23 -16.13 -101.76" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="72.47 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="65.56 -16.13 -106.22" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-98.79 -14.44 -26.73" hpr="19.0 -0.6 1.9" scale="0.69 0.69 0.69"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.18 -13.28 -55.66" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.30 -13.28 -62.75" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.07 -13.28 -49.63" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-53.69 -13.28 -52.34" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-55.41 -13.28 -59.18" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-45.19 -13.28 -45.86" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-39.14 -13.28 -42.24" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.66 -13.28 -42.88" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-48.35 -13.28 -47.75" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.25 -13.28 -42.83" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 10.45" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 16.90" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.07 -17.10 20.51" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-71.81 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-81.44 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-78.62 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-73.43 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.78 -16.13 -96.45" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="34.45 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="45.01 -16.13 -94.85" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="22.40 -16.13 -94.19" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="11.84 -15.13 -91.34" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="19.17 -16.13 -95.80" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="28.12 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-59.95 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-65.14 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-67.96 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-58.33 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-80.17 -17.10 25.87" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-83.43 -17.10 21.68" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> - <static-object lod_instance="true" lod_group="grass_chunk" xyz="-87.82 -17.10 20.63" hpr="-3.6 11.1 -3.6" scale="0.85 0.85 0.85"/> - <static-object lod_distance="100.0" lod_group="death_grass_chunk" model="death_grass_chunk_low.b3d" xyz="274.55 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_distance="60.0" lod_group="death_grass_chunk" model="death_grass_chunk_hight.b3d" xyz="274.55 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-6.19 -22.85 -153.19" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-11.07 -22.85 -153.19" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-17.97 -23.13 -147.41" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-13.09 -22.85 -147.41" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-2.75 -23.39 -185.87" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-7.64 -23.67 -185.87" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-0.74 -23.39 -191.65" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="4.15 -23.39 -191.65" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-64.86 -29.25 -118.96" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-69.33 -29.25 -117.00" hpr="0.0 -13.7 0.0" scale="1.16 1.16 1.16"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-73.34 -29.53 -108.94" hpr="3.5 -14.3 4.9" scale="1.16 1.16 1.16"/> - <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-68.86 -29.25 -110.89" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> - </track> - <object type="animation" xyz="-148.25 18.15 -63.18" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="lightBeam.b3d"> - <curve channel="RotX" interpolation="linear" extend="cyclic"> - <p c="1.000 -0.000"/> - <p c="200.000 -0.000"/> - <p c="201.000 -0.000"/> - </curve> - <curve channel="RotZ" interpolation="linear" extend="cyclic"> - <p c="1.000 -0.000"/> - <p c="200.000 -0.000"/> - <p c="201.000 -0.000"/> - </curve> - <curve channel="RotY" interpolation="linear" extend="cyclic"> - <p c="1.000 -0.000"/> - <p c="200.000 358.200"/> - </curve> - </object> - <object type="animation" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> - <curve channel="RotX" interpolation="bezier" extend="cyclic"> - <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> - <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> - <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> - </curve> - <curve channel="RotZ" interpolation="bezier" extend="cyclic"> - <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> - <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> - <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> - </curve> - <curve channel="RotY" interpolation="bezier" extend="cyclic"> - <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> - <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> - <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> - </curve> - </object> - <object type="animation" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> - <curve channel="RotX" interpolation="bezier" extend="cyclic"> - <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> - <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> - <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> - </curve> - <curve channel="RotZ" interpolation="bezier" extend="cyclic"> - <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> - <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> - <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> - </curve> - <curve channel="RotY" interpolation="bezier" extend="cyclic"> - <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> - <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> - <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> - </curve> - </object> - <object type="animation" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> - <curve channel="RotX" interpolation="bezier" extend="cyclic"> - <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> - <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> - <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> - </curve> - <curve channel="RotZ" interpolation="bezier" extend="cyclic"> - <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> - <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> - <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> - </curve> - <curve channel="RotY" interpolation="bezier" extend="cyclic"> - <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> - <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> - <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> - </curve> - </object> - <object type="animation" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> - <curve channel="RotX" interpolation="bezier" extend="cyclic"> - <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> - <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> - <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> - </curve> - <curve channel="RotZ" interpolation="bezier" extend="cyclic"> - <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> - <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> - <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> - </curve> - <curve channel="RotY" interpolation="bezier" extend="cyclic"> - <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> - <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> - <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> - </curve> - </object> - <object type="animation" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> - <curve channel="RotX" interpolation="bezier" extend="cyclic"> - <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> - <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> - <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> - </curve> - <curve channel="RotZ" interpolation="bezier" extend="cyclic"> - <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> - <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> - <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> - </curve> - <curve channel="RotY" interpolation="bezier" extend="cyclic"> - <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> - <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> - <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> - </curve> - </object> - <object type="animation" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> - <curve channel="RotX" interpolation="bezier" extend="cyclic"> - <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> - <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> - <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> - </curve> - <curve channel="RotZ" interpolation="bezier" extend="cyclic"> - <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> - <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> - <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> - </curve> - <curve channel="RotY" interpolation="bezier" extend="cyclic"> - <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> - <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> - <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> - </curve> - </object> - <object type="animation" xyz="46.25 -16.96 15.70" hpr="-8.8 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_lantern.b3d"> - </object> - <object type="animation" xyz="46.25 -16.99 17.96" hpr="0.0 -0.0 -0.0" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_lantern.b3d"> - </object> - <object type="animation" xyz="62.15 -6.98 -171.37" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy2.b3d"> - <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - </object> - <object type="animation" xyz="-45.55 -18.14 -170.41" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy.b3d"> - <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - </object> - <object type="animation" xyz="37.25 -5.07 13.25" hpr="0.0 25.5 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy2.b3d"> - <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - </object> - <object type="animation" xyz="3.85 -7.86 -0.35" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy.b3d"> - <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> - <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> - <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> - <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> - </curve> - </object> - <object type="animation" xyz="-44.05 -14.11 -163.50" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> - </object> - <object type="animation" xyz="74.93 -6.67 -208.19" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> - </object> - <object type="animation" xyz="29.20 -5.27 9.43" hpr="-0.0 90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> - </object> - <object type="animation" xyz="-127.19 3.73 -63.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> - </object> - <object type="animation" xyz="63.04 -9.51 -171.52" hpr="-0.0 -130.0 -0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> - </object> - <sun fog="true" fog-color="21 43 75" fog-start="20.00" fog-end="160.00"/> - <sky-color rgb="77 104 255"/> - <weather type="rain" /> - <sky-box texture="sky.jpg sky.jpg sky.jpg sky.jpg sky-m.jpg sky-m.jpg"/> - <camera far="1000.0"/> - <checks> - <check-lap kind="lap" same-group="0" other-ids="1" /> - <check-line kind="activate" other-ids="2" p1="-70.77 -90.29" p2="-101.92 -90.29" - min-height="-29.57" same-group="1"/> - <check-line kind="activate" other-ids="0" p1="-28.25 -73.00" p2="-59.39 -73.00" - min-height="-11.37" same-group="2"/> - </checks> - <water model="seaAnimation.b3d" xyz="0.00 6.60 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" height="1.00" speed="200.00" length="10.00"/> - <water model="fishing_net.b3d" xyz="72.02 -14.19 -180.01" hpr="-45.0 0.0 90.0" scale="1.00 1.00 1.00" height="0.10" speed="100.00" length="10.00"/> - <item x="83.67" y="-16.09" z="0.94" /> - <item x="81.79" y="-16.09" z="-0.97" /> - <item x="79.71" y="-16.09" z="-2.75" /> - <item x="77.73" y="-16.09" z="-4.54" /> - <small-nitro x="27.05" y="-16.09" z="-11.42" /> - <small-nitro x="11.63" y="-16.09" z="-24.53" /> - <small-nitro x="-1.90" y="-16.09" z="-13.01" /> - <small-nitro x="-48.92" y="-16.09" z="23.06" h="29.69" /> - <small-nitro x="-50.41" y="-16.09" z="14.23" h="29.69" /> - <item x="-49.86" y="-16.09" z="17.01" h="29.69" /> - <item x="-49.41" y="-16.09" z="19.71" h="29.69" /> - <item x="-99.43" y="-24.52" z="-53.72" h="19.80" /> - <item x="-98.17" y="-24.52" z="-51.37" h="19.80" /> - <item x="-96.82" y="-24.52" z="-48.99" h="19.80" /> - <item x="-95.69" y="-24.52" z="-46.55" h="19.80" /> - <item x="-25.60" y="-23.54" z="-154.53" h="19.80" /> - <item x="-26.73" y="-23.54" z="-156.96" h="19.80" /> - <small-nitro x="-32.35" y="-23.70" z="-158.41" h="29.69" /> - <small-nitro x="-25.91" y="-23.70" z="-161.93" h="29.69" /> - <item x="63.16" y="-16.09" z="-135.78" h="-37.85" /> - <item x="65.81" y="-16.09" z="-135.59" h="-37.85" /> - <item x="68.55" y="-16.09" z="-135.45" h="-37.85" /> - <item x="71.21" y="-16.09" z="-135.10" h="-37.85" /> - <item x="14.39" y="-14.56" z="-102.84" h="29.69" /> - <item x="13.94" y="-14.56" z="-105.53" h="29.69" /> - <small-nitro x="13.39" y="-14.56" z="-108.32" h="29.69" /> - <small-nitro x="14.88" y="-14.56" z="-99.49" h="29.69" /> - <object type="billboard" texture="lightHaloY.png" xyz="-148.23 56.18 -62.26" - width="19.870" height="19.870" > - </object> - <object type="billboard" texture="lightHaloY.png" xyz="-147.36 56.18 -63.68" - width="19.870" height="19.870" > - </object> - <object type="billboard" texture="lightHaloY.png" xyz="-149.02 56.18 -63.72" - width="19.870" height="19.870" > - </object> - <object type="billboard" texture="lightHaloY.png" xyz="-125.30 2.02 -63.09" - width="5.205" height="5.205" > - </object> - <object type="billboard" texture="lightHaloY.png" xyz="-44.05 -15.82 -161.61" - width="5.205" height="5.205" > - </object> - <object type="billboard" texture="lightHaloY.png" xyz="75.00 -8.38 -206.30" - width="5.205" height="5.205" > - </object> - <object type="billboard" texture="lightHaloY.png" xyz="61.91 -11.21 -170.00" - width="5.205" height="5.205" > - </object> - <object type="billboard" texture="lightHaloY.png" xyz="29.13 -6.98 7.54" - width="5.205" height="5.205" > - </object> - <default-start karts-per-row ="2" - forwards-distance ="1.50" - sidewards-distance="3.00" - upwards-distance ="0.10"/> -</scene> +<?xml version="1.0"?> +<!-- Generated with script from SVN rev 14858 --> +<scene> + <lod> + <group name="death_grass_chunk"> + <static-object lod_distance="60" lod_group="death_grass_chunk" model="death_grass_chunk_hight.b3d" xyz="274.55 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="static"/> + <static-object lod_distance="100" lod_group="death_grass_chunk" model="death_grass_chunk_low.b3d" xyz="274.55 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="static"/> + </group> + <group name="grass_chunk"> + <static-object lod_distance="60" lod_group="grass_chunk" model="grass_chunk_hight.b3d" xyz="266.88 -15.84 -24.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="static"/> + <static-object lod_distance="100" lod_group="grass_chunk" model="grass_chunk_low.b3d" xyz="266.88 -15.84 -30.76" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="static"/> + </group> + <group name="pine_tree_lod"> + <static-object lod_distance="70" lod_group="pine_tree_lod" model="pine_tree_lod_hight.b3d" xyz="270.46 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38" interaction="static"/> + <static-object lod_distance="150" lod_group="pine_tree_lod" model="pine_tree_lod_medium.b3d" xyz="293.33 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38" interaction="static"/> + <static-object lod_distance="300" lod_group="pine_tree_lod" model="pine_tree_lod_low.b3d" xyz="309.45 -14.16 -16.96" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38" interaction="static"/> + </group> + <group name="miniLamp"> + <static-object lod_distance="150" lod_group="miniLamp" model="miniLampPost_low.b3d" xyz="-156.19 3.73 -49.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost"/> + </group> + </lod> + <track model="lighthouse-terrain_track.b3d" x="0" y="0" z="0"> + <static-object model="vineUnderCave.b3d" xyz="-86.86 -17.34 -87.70" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object model="bigTerrainChunk.b3d" xyz="220.85 16.34 -41.59" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object model="lightWindows.b3d" xyz="-158.20 55.48 -63.22" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="102.39 -11.20 -15.52" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-96.85 -8.65 -29.26" hpr="0.0 -0.0 0.0" scale="2.71 2.71 2.71"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-47.61 -12.51 33.26" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -8.10 -4.66" hpr="0.0 -0.0 0.0" scale="2.29 2.29 2.29"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-139.12 -6.11 16.29" hpr="0.0 30.7 0.0" scale="3.17 3.17 3.17"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="66.09 -11.20 -92.83" hpr="0.0 -0.0 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="116.99 -11.20 -5.45" hpr="0.0 21.7 0.0" scale="1.81 1.81 1.81"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="117.67 -11.20 -33.35" hpr="0.0 -77.7 0.0" scale="2.38 2.38 2.38"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-117.71 -6.11 30.54" hpr="0.0 -75.4 0.0" scale="3.17 3.17 3.17"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-97.58 -11.46 36.36" hpr="-0.0 -106.1 -0.0" scale="2.29 2.29 2.29"/> + <static-object lod_instance="true" lod_group="pine_tree_lod" xyz="-77.01 -11.87 36.36" hpr="-0.0 -106.1 -0.0" scale="2.68 2.68 2.68"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="99.38 -16.17 -18.46" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="106.39 -15.64 -18.46" hpr="-0.0 -0.0 0.5" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="102.42 -16.06 -12.81" hpr="-0.0 -0.0 6.5" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.30 -14.44 -25.77" hpr="19.0 -0.6 1.9" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-93.63 -14.41 -33.94" hpr="-9.9 0.3 1.9" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-101.33 -14.32 -29.38" hpr="-2.8 -2.3 12.3" scale="0.71 0.71 0.71"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.11 -17.10 30.07" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-44.92 -17.10 28.91" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-52.93 -17.10 33.59" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.30 -17.10 33.77" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> + <static-object model="dynamicSky.b3d" xyz="-45.36 251.46 102.38" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"> + <animated-texture name="dynamic_clouds.png" dx="0.050" dy="0.010" /> + </static-object> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 3.24" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="2.54 -17.10 -6.38" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="9.45 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-4.79 -17.10 -1.93" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-1.28 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="5.77 -17.10 -4.78" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-35.87 -13.28 -72.96" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.04 -13.28 -66.25" hpr="-12.5 69.5 -10.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-36.40 -13.28 -62.03" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.74 -13.28 -76.46" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-38.39 -13.28 -70.38" hpr="-12.5 69.5 -10.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-29.23 -12.41 -67.42" hpr="-12.5 69.5 -10.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="68.79 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="61.74 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="58.23 -16.13 -101.76" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="72.47 -16.13 -104.62" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="65.56 -16.13 -106.22" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-98.79 -14.44 -26.73" hpr="19.0 -0.6 1.9" scale="0.69 0.69 0.69"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.18 -13.28 -55.66" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-56.30 -13.28 -62.75" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-50.07 -13.28 -49.63" hpr="13.6 102.3 16.9" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-53.69 -13.28 -52.34" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-55.41 -13.28 -59.18" hpr="13.6 102.3 16.9" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-45.19 -13.28 -45.86" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-39.14 -13.28 -42.24" hpr="-0.6 146.9 4.2" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-34.66 -13.28 -42.88" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-48.35 -13.28 -47.75" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-43.25 -13.28 -42.83" hpr="-0.6 146.9 4.2" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 10.45" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="37.92 -17.10 16.90" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.07 -17.10 20.51" hpr="-6.1 42.0 -4.8" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-71.81 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-81.44 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-78.62 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-73.43 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="41.78 -16.13 -96.45" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="34.45 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="45.01 -16.13 -94.85" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="22.40 -16.13 -94.19" hpr="-2.8 -2.3 -3.6" scale="1.20 1.20 1.20"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="11.84 -15.13 -91.34" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="19.17 -16.13 -95.80" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="28.12 -16.13 -92.00" hpr="-2.8 -2.3 -3.6" scale="0.98 0.98 0.98"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-59.95 -17.10 28.66" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-65.14 -17.10 29.81" hpr="-2.8 -2.3 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-67.96 -17.10 33.33" hpr="-16.7 75.4 -14.2" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-58.33 -17.10 33.51" hpr="-2.8 -2.3 -3.6" scale="1.07 1.07 1.07"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-80.17 -17.10 25.87" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-83.43 -17.10 21.68" hpr="5.4 -66.7 -9.0" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="grass_chunk" xyz="-87.82 -17.10 20.63" hpr="-3.6 11.1 -3.6" scale="0.85 0.85 0.85"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-6.19 -22.85 -153.19" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-11.07 -22.85 -153.19" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-17.97 -23.13 -147.41" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-13.09 -22.85 -147.41" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-2.75 -23.39 -185.87" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-7.64 -23.67 -185.87" hpr="1.0 -37.8 6.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-0.74 -23.39 -191.65" hpr="0.0 -37.3 0.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="4.15 -23.39 -191.65" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-64.86 -29.25 -118.96" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-69.33 -29.25 -117.00" hpr="0.0 -13.7 0.0" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-73.34 -29.53 -108.94" hpr="3.5 -14.3 4.9" scale="1.16 1.16 1.16"/> + <static-object lod_instance="true" lod_group="death_grass_chunk" xyz="-68.86 -29.25 -110.89" hpr="0.0 23.6 0.0" scale="1.00 1.00 1.00"/> + </track> + <object type="animation" xyz="-148.25 18.15 -63.18" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="lightBeam.b3d"> + <curve channel="RotX" interpolation="linear" extend="cyclic"> + <p c="1.000 -0.000"/> + <p c="200.000 -0.000"/> + <p c="201.000 -0.000"/> + </curve> + <curve channel="RotZ" interpolation="linear" extend="cyclic"> + <p c="1.000 -0.000"/> + <p c="200.000 -0.000"/> + <p c="201.000 -0.000"/> + </curve> + <curve channel="RotY" interpolation="linear" extend="cyclic"> + <p c="1.000 -0.000"/> + <p c="200.000 358.200"/> + </curve> + </object> + <object type="animation" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> + <curve channel="RotX" interpolation="bezier" extend="cyclic"> + <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> + <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> + <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="cyclic"> + <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> + <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> + <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="cyclic"> + <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> + <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> + <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> + </curve> + </object> + <object type="animation" xyz="-157.68 -47.34 -253.80" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> + <curve channel="RotX" interpolation="bezier" extend="cyclic"> + <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> + <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> + <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="cyclic"> + <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> + <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> + <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="cyclic"> + <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> + <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> + <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> + </curve> + </object> + <object type="animation" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> + <curve channel="RotX" interpolation="bezier" extend="cyclic"> + <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> + <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> + <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="cyclic"> + <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> + <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> + <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="cyclic"> + <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> + <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> + <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> + </curve> + </object> + <object type="animation" xyz="-112.65 -47.34 -339.07" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> + <curve channel="RotX" interpolation="bezier" extend="cyclic"> + <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> + <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> + <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="cyclic"> + <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> + <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> + <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="cyclic"> + <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> + <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> + <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> + </curve> + </object> + <object type="animation" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy.b3d"> + <curve channel="RotX" interpolation="bezier" extend="cyclic"> + <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> + <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> + <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="cyclic"> + <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> + <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> + <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="cyclic"> + <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> + <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> + <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> + </curve> + </object> + <object type="animation" xyz="-74.45 -47.34 -410.02" hpr="0.0 -0.0 -3.7" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_halo.b3d"> + <curve channel="RotX" interpolation="bezier" extend="cyclic"> + <p c="15.000 0.000" h1="-6.351 0.000" h2="36.751 0.000"/> + <p c="70.000 0.000" h1="48.849 0.000" h2="93.200 0.000"/> + <p c="129.000 0.000" h1="106.000 0.000" h2="151.600 0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="cyclic"> + <p c="15.000 -5.000" h1="-6.351 -5.000" h2="36.751 -5.000"/> + <p c="70.000 5.000" h1="48.849 5.000" h2="93.200 5.000"/> + <p c="129.000 -5.000" h1="106.000 -5.000" h2="151.600 -5.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="cyclic"> + <p c="15.000 -0.000" h1="-6.351 -0.000" h2="36.751 -0.000"/> + <p c="70.000 -0.000" h1="48.849 -0.000" h2="93.200 -0.000"/> + <p c="129.000 -0.000" h1="106.000 -0.000" h2="151.600 -0.000"/> + </curve> + </object> + <object type="animation" xyz="46.25 -16.96 15.70" hpr="-8.8 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_lantern.b3d"> + </object> + <object type="animation" xyz="46.25 -16.99 17.96" hpr="0.0 -0.0 -0.0" scale="1.00 1.00 1.00" interaction="ghost" model="buoy_lantern.b3d"> + </object> + <object type="animation" xyz="62.15 -6.98 -171.37" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy2.b3d"> + <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + </object> + <object type="animation" xyz="-45.55 -18.14 -170.41" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy.b3d"> + <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + </object> + <object type="animation" xyz="37.25 -5.07 13.25" hpr="0.0 25.5 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy2.b3d"> + <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + </object> + <object type="animation" xyz="3.85 -7.86 -0.35" hpr="0.0 71.9 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="fishing_buoy.b3d"> + <curve channel="ScaleX" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleZ" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 1.000" h1="24.774 1.000" h2="57.178 1.000"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + <curve channel="ScaleY" interpolation="bezier" extend="cyclic"> + <p c="1.000 1.000" h1="-14.226 1.000" h2="16.226 1.000"/> + <p c="40.000 0.900" h1="24.774 0.900" h2="57.178 0.900"/> + <p c="84.000 1.000" h1="66.822 1.000" h2="101.178 1.000"/> + </curve> + </object> + <object type="animation" xyz="-44.05 -14.11 -163.50" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> + </object> + <object type="animation" xyz="74.93 -6.67 -208.19" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> + </object> + <object type="animation" xyz="29.20 -5.27 9.43" hpr="-0.0 90.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> + </object> + <object type="animation" xyz="-127.19 3.73 -63.09" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> + </object> + <object type="animation" xyz="63.04 -9.51 -171.52" hpr="-0.0 -130.0 -0.0" scale="1.00 1.00 1.00" interaction="ghost" lod_instance="true" lod_group="miniLamp"> + </object> + <sun fog="true" fog-color="21 43 75" fog-start="20.00" fog-end="160.00"/> + <sky-color rgb="77 104 255"/> + <weather type="rain" /> + <sky-box texture="sky.jpg sky.jpg sky.jpg sky.jpg sky-m.jpg sky-m.jpg"/> + <camera far="1000.0"/> + <checks> + <check-lap kind="lap" same-group="0" other-ids="1" /> + <check-line kind="activate" other-ids="2" p1="-70.77 -90.29" p2="-101.92 -90.29" + min-height="-29.57" same-group="1"/> + <check-line kind="activate" other-ids="0" p1="-28.25 -73.00" p2="-59.39 -73.00" + min-height="-11.37" same-group="2"/> + </checks> + <water model="seaAnimation.b3d" xyz="0.00 6.60 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" height="1.00" speed="200.00" length="10.00"/> + <water model="fishing_net.b3d" xyz="72.02 -14.19 -180.01" hpr="-45.0 0.0 90.0" scale="1.00 1.00 1.00" height="0.10" speed="100.00" length="10.00"/> + <item x="83.67" y="-16.09" z="0.94" /> + <item x="81.79" y="-16.09" z="-0.97" /> + <item x="79.71" y="-16.09" z="-2.75" /> + <item x="77.73" y="-16.09" z="-4.54" /> + <small-nitro x="27.05" y="-16.09" z="-11.42" /> + <small-nitro x="11.63" y="-16.09" z="-24.53" /> + <small-nitro x="-1.90" y="-16.09" z="-13.01" /> + <small-nitro x="-48.92" y="-16.09" z="23.06" h="29.69" /> + <small-nitro x="-50.41" y="-16.09" z="14.23" h="29.69" /> + <item x="-49.86" y="-16.09" z="17.01" h="29.69" /> + <item x="-49.41" y="-16.09" z="19.71" h="29.69" /> + <item x="-99.43" y="-24.52" z="-53.72" h="19.80" /> + <item x="-98.17" y="-24.52" z="-51.37" h="19.80" /> + <item x="-96.82" y="-24.52" z="-48.99" h="19.80" /> + <item x="-95.69" y="-24.52" z="-46.55" h="19.80" /> + <item x="-25.60" y="-23.54" z="-154.53" h="19.80" /> + <item x="-26.73" y="-23.54" z="-156.96" h="19.80" /> + <small-nitro x="-32.35" y="-23.70" z="-158.41" h="29.69" /> + <small-nitro x="-25.91" y="-23.70" z="-161.93" h="29.69" /> + <item x="63.16" y="-16.09" z="-135.78" h="-37.85" /> + <item x="65.81" y="-16.09" z="-135.59" h="-37.85" /> + <item x="68.55" y="-16.09" z="-135.45" h="-37.85" /> + <item x="71.21" y="-16.09" z="-135.10" h="-37.85" /> + <item x="14.39" y="-14.56" z="-102.84" h="29.69" /> + <item x="13.94" y="-14.56" z="-105.53" h="29.69" /> + <small-nitro x="13.39" y="-14.56" z="-108.32" h="29.69" /> + <small-nitro x="14.88" y="-14.56" z="-99.49" h="29.69" /> + <object type="billboard" texture="lightHaloY.png" xyz="-148.23 56.18 -62.26" + width="19.870" height="19.870" > + </object> + <object type="billboard" texture="lightHaloY.png" xyz="-147.36 56.18 -63.68" + width="19.870" height="19.870" > + </object> + <object type="billboard" texture="lightHaloY.png" xyz="-149.02 56.18 -63.72" + width="19.870" height="19.870" > + </object> + <object type="billboard" texture="lightHaloY.png" xyz="-125.30 2.02 -63.09" + width="5.205" height="5.205" > + </object> + <object type="billboard" texture="lightHaloY.png" xyz="-44.05 -15.82 -161.61" + width="5.205" height="5.205" > + </object> + <object type="billboard" texture="lightHaloY.png" xyz="75.00 -8.38 -206.30" + width="5.205" height="5.205" > + </object> + <object type="billboard" texture="lightHaloY.png" xyz="61.91 -11.21 -170.00" + width="5.205" height="5.205" > + </object> + <object type="billboard" texture="lightHaloY.png" xyz="29.13 -6.98 7.54" + width="5.205" height="5.205" > + </object> + <default-start karts-per-row ="2" + forwards-distance ="1.50" + sidewards-distance="3.00" + upwards-distance ="0.10"/> +</scene> Modified: main/trunk/data/tracks/lighthouse/track.xml =================================================================== --- main/trunk/data/tracks/lighthouse/track.xml 2014-01-01 18:11:28 UTC (rev 14870) +++ main/trunk/data/tracks/lighthouse/track.xml 2014-01-01 18:20:51 UTC (rev 14871) @@ -1,12 +1,12 @@ -<?xml version="1.0"?> -<!-- Generated with script from SVN rev 14634 --> -<track name = "Around the lighthouse" - version = "5" - groups = "standard" - designer = "jean-manuel clemençon" - music = "OnTheRiver.music" - screenshot = "screenshot.jpg" - smooth-normals = "false" - reverse = "Y" -> -</track> +<?xml version="1.0"?> +<!-- Generated with script from SVN rev 14858 --> +<track name = "Around the lighthouse" + versi... [truncated message content] |
From: <sam...@us...> - 2014-01-04 20:42:07
|
Revision: 14908 http://sourceforge.net/p/supertuxkart/code/14908 Author: samuncle Date: 2014-01-04 20:42:04 +0000 (Sat, 04 Jan 2014) Log Message: ----------- Add the first object to test the library (It's programmer's art for the moment :P) Added Paths: ----------- main/trunk/data/library/ main/trunk/data/library/stklib_oldLantern_a/ main/trunk/data/library/stklib_oldLantern_a/materials.xml main/trunk/data/library/stklib_oldLantern_a/node.xml main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_main.b3d main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_track.b3d main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_ao_a.png main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.b3d main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.png main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_lensFlare_a.png Added: main/trunk/data/library/stklib_oldLantern_a/materials.xml =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/materials.xml (rev 0) +++ main/trunk/data/library/stklib_oldLantern_a/materials.xml 2014-01-04 20:42:04 UTC (rev 14908) @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<!-- Generated with script from SVN rev Unknown --> +<materials> + <material name="stklib_oldLantern_glow_a.png" fog="N" light="N" compositing="additive" disable-z-write="Y"/> + <material name="stklib_oldLantern_lensFlare_a.png" fog="N" light="N" compositing="additive" disable-z-write="Y"/> +</materials> Added: main/trunk/data/library/stklib_oldLantern_a/node.xml =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/node.xml (rev 0) +++ main/trunk/data/library/stklib_oldLantern_a/node.xml 2014-01-04 20:42:04 UTC (rev 14908) @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<!-- Generated with script from SVN rev 14899 --> +<scene> + <object type="animation" xyz="0.00 0.00 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="static" shape="box" model="stklib_oldLantern_a_main.b3d"> + </object> + <object type="animation" xyz="0.00 0.00 0.00" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" interaction="ghost" model="stklib_oldLantern_glow_a.b3d" forcedbloom="true"> + </object> + <object type="billboard" texture="stklib_oldLantern_lensFlare_a.png" xyz="-0.00 -0.56 0.00" + width="5.110" height="5.113" fadeout="true" start="5.00" end="15.00"> + </object> + <light xyz="0.00 -0.85 0.00" distance="25.00" energy="2.00" color="255 0 216"> + </light> + <default-start karts-per-row ="2" + forwards-distance ="1.50" + sidewards-distance="3.00" + upwards-distance ="0.10"/> +</scene> Added: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_main.b3d =================================================================== (Binary files differ) Index: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_main.b3d =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_main.b3d 2014-01-04 20:34:38 UTC (rev 14907) +++ main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_main.b3d 2014-01-04 20:42:04 UTC (rev 14908) Property changes on: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_main.b3d ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_track.b3d =================================================================== (Binary files differ) Index: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_track.b3d =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_track.b3d 2014-01-04 20:34:38 UTC (rev 14907) +++ main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_track.b3d 2014-01-04 20:42:04 UTC (rev 14908) Property changes on: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_a_track.b3d ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_ao_a.png =================================================================== (Binary files differ) Index: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_ao_a.png =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_ao_a.png 2014-01-04 20:34:38 UTC (rev 14907) +++ main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_ao_a.png 2014-01-04 20:42:04 UTC (rev 14908) Property changes on: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_ao_a.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.b3d =================================================================== (Binary files differ) Index: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.b3d =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.b3d 2014-01-04 20:34:38 UTC (rev 14907) +++ main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.b3d 2014-01-04 20:42:04 UTC (rev 14908) Property changes on: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.b3d ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.png =================================================================== (Binary files differ) Index: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.png =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.png 2014-01-04 20:34:38 UTC (rev 14907) +++ main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.png 2014-01-04 20:42:04 UTC (rev 14908) Property changes on: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_glow_a.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_lensFlare_a.png =================================================================== (Binary files differ) Index: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_lensFlare_a.png =================================================================== --- main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_lensFlare_a.png 2014-01-04 20:34:38 UTC (rev 14907) +++ main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_lensFlare_a.png 2014-01-04 20:42:04 UTC (rev 14908) Property changes on: main/trunk/data/library/stklib_oldLantern_a/stklib_oldLantern_lensFlare_a.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2014-01-06 02:55:40
|
Revision: 14938 http://sourceforge.net/p/supertuxkart/code/14938 Author: auria Date: 2014-01-06 02:55:37 +0000 (Mon, 06 Jan 2014) Log Message: ----------- Add ozoneone's new snow song Modified Paths: -------------- main/trunk/data/CREDITS main/trunk/data/tracks/snowtuxpeak/track.xml Added Paths: ----------- main/trunk/data/music/snowmountain.music main/trunk/data/music/snowmountain.ogg Modified: main/trunk/data/CREDITS =================================================================== --- main/trunk/data/CREDITS 2014-01-06 02:03:42 UTC (rev 14937) +++ main/trunk/data/CREDITS 2014-01-06 02:55:37 UTC (rev 14938) @@ -167,8 +167,8 @@ --++ Added: main/trunk/data/music/snowmountain.music =================================================================== --- main/trunk/data/music/snowmountain.music (rev 0) +++ main/trunk/data/music/snowmountain.music 2014-01-06 02:55:37 UTC (rev 14938) @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<music title = "Snow" + composer = "0zone0ne" + file = "snowmountain.ogg" /> + Added: main/trunk/data/music/snowmountain.ogg =================================================================== (Binary files differ) Index: main/trunk/data/music/snowmountain.ogg =================================================================== --- main/trunk/data/music/snowmountain.ogg 2014-01-06 02:03:42 UTC (rev 14937) +++ main/trunk/data/music/snowmountain.ogg 2014-01-06 02:55:37 UTC (rev 14938) Property changes on: main/trunk/data/music/snowmountain.ogg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: main/trunk/data/tracks/snowtuxpeak/track.xml =================================================================== --- main/trunk/data/tracks/snowtuxpeak/track.xml 2014-01-06 02:03:42 UTC (rev 14937) +++ main/trunk/data/tracks/snowtuxpeak/track.xml 2014-01-06 02:55:37 UTC (rev 14938) @@ -4,7 +4,7 @@ version = "5" groups = "standard" designer = "Jean-Manuel Clemencon & Ivar Ten Cate" - music = "OnTheRiver.music" + music = "snowmountain.music" screenshot = "sshot-snowtuxpeak.jpg" smooth-normals = "true" reverse = "Y" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |