From: <au...@us...> - 2012-09-30 19:56:05
|
Revision: 11640 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=11640&view=rev Author: auria Date: 2012-09-30 19:55:58 +0000 (Sun, 30 Sep 2012) Log Message: ----------- Many small tweaks to intro. Feedback welcome Modified Paths: -------------- main/trunk/data/textures/License.txt main/trunk/data/tracks/introcutscene/scene.xml main/trunk/data/tracks/introcutscene2/intro2.music main/trunk/data/tracks/introcutscene2/nolok_speech.ogg main/trunk/data/tracks/introcutscene2/scene.xml main/trunk/data/tracks/overworld/overworld_track.b3d main/trunk/data/tracks/overworld/scene.xml Added Paths: ----------- main/trunk/data/textures/gnu.png main/trunk/data/textures/nolok_character.png main/trunk/data/textures/tapis.png main/trunk/data/tracks/introcutscene/button.ogg main/trunk/data/tracks/introcutscene/license.txt main/trunk/data/tracks/introcutscene/spaceship_engine.ogg main/trunk/data/tracks/introcutscene/spaceship_engine_short.ogg main/trunk/data/tracks/introcutscene2/license.txt main/trunk/data/tracks/introcutscene2/spaceship.ogg main/trunk/data/tracks/introcutscene2/spaceship_engine_short.ogg Removed Paths: ------------- main/trunk/data/karts/gnu/gnu.png main/trunk/data/karts/gnu/tapis.png main/trunk/data/karts/nolok/nolok_character.png main/trunk/data/tracks/endcutscene/gnu.png main/trunk/data/tracks/introcutscene/gnu.png main/trunk/data/tracks/introcutscene/nolok_character.png main/trunk/data/tracks/introcutscene/tapis.png main/trunk/data/tracks/introcutscene2/nolok_character.png Deleted: main/trunk/data/karts/gnu/gnu.png =================================================================== (Binary files differ) Deleted: main/trunk/data/karts/gnu/tapis.png =================================================================== (Binary files differ) Deleted: main/trunk/data/karts/nolok/nolok_character.png =================================================================== (Binary files differ) Modified: main/trunk/data/textures/License.txt =================================================================== --- main/trunk/data/textures/License.txt 2012-09-30 19:55:33 UTC (rev 11639) +++ main/trunk/data/textures/License.txt 2012-09-30 19:55:58 UTC (rev 11640) @@ -23,6 +23,13 @@ * cup_*, speedback, speedfore by yeKcim (Anthony Carré) +* gnu, tapis + by Benjamin Arnaudet + released under GNU GPL license + +* nolok_character + by Cheleb + * purplenebula*, waternormals.jpg, waternormals2.jpg, sea2 by Marianne Gagnon (Auria) Copied: main/trunk/data/textures/gnu.png (from rev 11633, main/trunk/data/tracks/endcutscene/gnu.png) =================================================================== (Binary files differ) Copied: main/trunk/data/textures/nolok_character.png (from rev 11633, main/trunk/data/karts/nolok/nolok_character.png) =================================================================== (Binary files differ) Copied: main/trunk/data/textures/tapis.png (from rev 11633, main/trunk/data/tracks/introcutscene/tapis.png) =================================================================== (Binary files differ) Deleted: main/trunk/data/tracks/endcutscene/gnu.png =================================================================== (Binary files differ) Added: main/trunk/data/tracks/introcutscene/button.ogg =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/introcutscene/button.ogg ___________________________________________________________________ Added: svn:mime-type + application/ogg Deleted: main/trunk/data/tracks/introcutscene/gnu.png =================================================================== (Binary files differ) Added: main/trunk/data/tracks/introcutscene/license.txt =================================================================== --- main/trunk/data/tracks/introcutscene/license.txt (rev 0) +++ main/trunk/data/tracks/introcutscene/license.txt 2012-09-30 19:55:58 UTC (rev 11640) @@ -0,0 +1,38 @@ +nolikship, lantern*, tree1_low, fence_pagoda.png + by Jean-Manuel Clémençon + released under CC-BY-SA 3.0 + +pagoda_wall + by Jean-Manuel Clémençon + released under public domain + +flute + by Marianne Gagnon + released in the public domain + +grass + created by Christoph Egger <de...@ch...>, Marianne Gagnon (Auria), MiniBjorn and Samuncle + released under CC-BY-SA 3.0 + +Texture from open game art (http://opengameart.org/content/dims-arboretum-0) + Catail.png + by Dims, released under CC-BY-SA 3.0 + + shintoB.jpg + by gladius CC-BY-SA 3.0 + +roadRoundBrick + by Sean Greene (Iconoclast) + released under public domain + +models by Jean-Manuel Clémençon, scene by Marianne Gagnon + released under CC-BY-SA 3.0 + + except Gnu (GPL) by Benjamin Arnaudet and Nolok by Cheleb (CC-BY-SA 3.0) + +Spaceship_engine.ogg + by Marianne Gagnon + released under CC-BY-SA 3.0 + based on CC0 sounds by Heigh-hoo and scarbelly25 + http://www.freesound.org/people/scarbelly25/sounds/33943/ + http://www.freesound.org/people/Heigh-hoo/sounds/63259/ \ No newline at end of file Deleted: main/trunk/data/tracks/introcutscene/nolok_character.png =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/introcutscene/scene.xml =================================================================== --- main/trunk/data/tracks/introcutscene/scene.xml 2012-09-30 19:55:33 UTC (rev 11639) +++ main/trunk/data/tracks/introcutscene/scene.xml 2012-09-30 19:55:58 UTC (rev 11640) @@ -667,6 +667,129 @@ </object> <object type="sfx-emitter" sound="tractor_beam.ogg" rolloff="0.001" volume="1.0" max_dist="500.0" xyz="-101.64 0.87 49.75" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" conditions="frame 1116"> </object> + <object type="sfx-emitter" sound="button.ogg" rolloff="0.001" volume="1.0" max_dist="500.0" xyz="-88.17 1.04 41.20" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" conditions="frame 805"> + </object> + <object type="sfx-emitter" sound="spaceship_engine.ogg" rolloff="0.100" volume="0.6499999761581421" max_dist="500.0" xyz="-132.63 3.94 57.80" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" conditions="frame 925"> + <curve channel="LocX" interpolation="bezier" extend="const"> + <p c="927.000 -132.635" h1="921.299 -132.635" h2="932.701 -132.635"/> + <p c="947.000 -113.914" h1="940.687 -118.509" h2="955.839 -107.482"/> + <p c="975.000 -99.368" h1="965.299 -99.368" h2="984.701 -99.368"/> + </curve> + <curve channel="LocZ" interpolation="bezier" extend="const"> + <p c="927.000 57.799" h1="919.202 57.799" h2="934.798 57.799"/> + <p c="947.000 56.777" h1="939.204 57.207" h2="957.915 56.176"/> + <p c="975.000 55.121" h1="964.088 55.121" h2="985.912 55.121"/> + </curve> + <curve channel="LocY" interpolation="bezier" extend="const"> + <p c="927.000 3.945" h1="919.192 3.945" h2="934.808 3.945"/> + <p c="947.000 3.945" h1="939.216 3.945" h2="957.897 3.945"/> + <p c="975.000 8.383" h1="964.203 8.383" h2="985.797 8.383"/> + </curve> + <curve channel="RotX" interpolation="bezier" extend="const"> + <p c="927.000 -0.000" h1="919.192 -0.000" h2="934.808 -0.000"/> + <p c="947.000 -0.000" h1="939.192 -0.000" h2="957.932 -0.000"/> + <p c="975.000 -0.000" h1="964.068 -0.000" h2="985.932 -0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="const"> + <p c="927.000 -0.000" h1="919.192 -0.000" h2="934.808 -0.000"/> + <p c="947.000 -0.000" h1="939.192 -0.000" h2="957.932 -0.000"/> + <p c="975.000 -0.000" h1="964.068 -0.000" h2="985.932 -0.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="const"> + <p c="927.000 -0.000" h1="919.192 -0.000" h2="934.808 -0.000"/> + <p c="947.000 -0.000" h1="939.192 -0.000" h2="957.932 -0.000"/> + <p c="975.000 -0.000" h1="964.068 -0.000" h2="985.932 -0.000"/> + </curve> + <curve channel="ScaleX" interpolation="bezier" extend="const"> + <p c="927.000 1.000" h1="919.192 1.000" h2="934.808 1.000"/> + <p c="947.000 1.000" h1="939.192 1.000" h2="957.932 1.000"/> + <p c="975.000 1.000" h1="964.068 1.000" h2="985.932 1.000"/> + </curve> + <curve channel="ScaleZ" interpolation="bezier" extend="const"> + <p c="927.000 1.000" h1="919.192 1.000" h2="934.808 1.000"/> + <p c="947.000 1.000" h1="939.192 1.000" h2="957.932 1.000"/> + <p c="975.000 1.000" h1="964.068 1.000" h2="985.932 1.000"/> + </curve> + <curve channel="ScaleY" interpolation="bezier" extend="const"> + <p c="927.000 1.000" h1="919.192 1.000" h2="934.808 1.000"/> + <p c="947.000 1.000" h1="939.192 1.000" h2="957.932 1.000"/> + <p c="975.000 1.000" h1="964.068 1.000" h2="985.932 1.000"/> + </curve> + </object> + <object type="sfx-emitter" sound="spaceship_engine_short.ogg" rolloff="0.100" volume="0.6499999761581421" max_dist="500.0" xyz="-132.63 3.94 57.80" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" conditions="frame 1423"> + <curve channel="LocX" interpolation="bezier" extend="const"> + <p c="927.000 -132.635" h1="921.299 -132.635" h2="932.701 -132.635"/> + <p c="947.000 -113.914" h1="940.687 -118.509" h2="955.839 -107.482"/> + <p c="975.000 -99.368" h1="964.420 -99.368" h2="1027.902 -99.368"/> + <p c="1423.000 -99.368" h1="1383.035 -99.368" h2="1430.993 -99.368"/> + <p c="1444.000 -108.957" h1="1438.838 -102.587" h2="1450.882 -117.450"/> + <p c="1472.000 -165.278" h1="1467.134 -165.278" h2="1476.866 -165.278"/> + </curve> + <curve channel="LocZ" interpolation="bezier" extend="const"> + <p c="927.000 57.799" h1="919.202 57.799" h2="934.798 57.799"/> + <p c="947.000 56.777" h1="939.204 57.207" h2="957.915 56.176"/> + <p c="975.000 55.121" h1="964.073 55.121" h2="1029.634 55.121"/> + <p c="1423.000 55.121" h1="1382.007 55.121" h2="1431.199 55.121"/> + <p c="1444.000 55.072" h1="1435.801 55.093" h2="1454.932 55.045"/> + <p c="1472.000 54.995" h1="1461.068 54.995" h2="1482.932 54.995"/> + </curve> + <curve channel="LocY" interpolation="bezier" extend="const"> + <p c="927.000 3.945" h1="919.192 3.945" h2="934.808 3.945"/> + <p c="947.000 3.945" h1="939.216 3.945" h2="957.897 3.945"/> + <p c="975.000 8.383" h1="964.096 8.282" h2="1029.484 8.891"/> + <p c="1423.000 8.891" h1="1382.012 8.383" h2="1431.198 8.992"/> + <p c="1444.000 9.534" h1="1435.806 9.274" h2="1454.926 9.881"/> + <p c="1472.000 10.454" h1="1461.074 10.454" h2="1482.926 10.454"/> + </curve> + <curve channel="RotX" interpolation="bezier" extend="const"> + <p c="927.000 -0.000" h1="919.192 -0.000" h2="934.808 -0.000"/> + <p c="947.000 -0.000" h1="939.192 -0.000" h2="957.932 -0.000"/> + <p c="975.000 -0.000" h1="964.068 -0.000" h2="1029.658 -0.000"/> + <p c="1423.000 -0.000" h1="1382.007 -0.000" h2="1431.199 -0.000"/> + <p c="1444.000 -0.000" h1="1435.801 -0.000" h2="1454.932 -0.000"/> + <p c="1472.000 -0.000" h1="1461.068 -0.000" h2="1482.932 -0.000"/> + </curve> + <curve channel="RotZ" interpolation="bezier" extend="const"> + <p c="927.000 -0.000" h1="919.192 -0.000" h2="934.808 -0.000"/> + <p c="947.000 -0.000" h1="939.192 -0.000" h2="957.932 -0.000"/> + <p c="975.000 -0.000" h1="964.068 -0.000" h2="1029.658 -0.000"/> + <p c="1423.000 -0.000" h1="1382.007 -0.000" h2="1431.199 -0.000"/> + <p c="1444.000 -0.000" h1="1435.801 -0.000" h2="1454.932 -0.000"/> + <p c="1472.000 -0.000" h1="1461.068 -0.000" h2="1482.932 -0.000"/> + </curve> + <curve channel="RotY" interpolation="bezier" extend="const"> + <p c="927.000 -0.000" h1="919.192 -0.000" h2="934.808 -0.000"/> + <p c="947.000 -0.000" h1="939.192 -0.000" h2="957.932 -0.000"/> + <p c="975.000 -0.000" h1="964.068 -0.000" h2="1029.658 -0.000"/> + <p c="1423.000 -0.000" h1="1382.007 -0.000" h2="1431.199 -0.000"/> + <p c="1444.000 -0.000" h1="1435.801 -0.000" h2="1454.932 -0.000"/> + <p c="1472.000 -0.000" h1="1461.068 -0.000" h2="1482.932 -0.000"/> + </curve> + <curve channel="ScaleX" interpolation="bezier" extend="const"> + <p c="927.000 1.000" h1="919.192 1.000" h2="934.808 1.000"/> + <p c="947.000 1.000" h1="939.192 1.000" h2="957.932 1.000"/> + <p c="975.000 1.000" h1="964.068 1.000" h2="1029.658 1.000"/> + <p c="1423.000 1.000" h1="1382.007 1.000" h2="1431.199 1.000"/> + <p c="1444.000 1.000" h1="1435.801 1.000" h2="1454.932 1.000"/> + <p c="1472.000 1.000" h1="1461.068 1.000" h2="1482.932 1.000"/> + </curve> + <curve channel="ScaleZ" interpolation="bezier" extend="const"> + <p c="927.000 1.000" h1="919.192 1.000" h2="934.808 1.000"/> + <p c="947.000 1.000" h1="939.192 1.000" h2="957.932 1.000"/> + <p c="975.000 1.000" h1="964.068 1.000" h2="1029.658 1.000"/> + <p c="1423.000 1.000" h1="1382.007 1.000" h2="1431.199 1.000"/> + <p c="1444.000 1.000" h1="1435.801 1.000" h2="1454.932 1.000"/> + <p c="1472.000 1.000" h1="1461.068 1.000" h2="1482.932 1.000"/> + </curve> + <curve channel="ScaleY" interpolation="bezier" extend="const"> + <p c="927.000 1.000" h1="919.192 1.000" h2="934.808 1.000"/> + <p c="947.000 1.000" h1="939.192 1.000" h2="957.932 1.000"/> + <p c="975.000 1.000" h1="964.068 1.000" h2="1029.658 1.000"/> + <p c="1423.000 1.000" h1="1382.007 1.000" h2="1431.199 1.000"/> + <p c="1444.000 1.000" h1="1435.801 1.000" h2="1454.932 1.000"/> + <p c="1472.000 1.000" h1="1461.068 1.000" h2="1482.932 1.000"/> + </curve> + </object> <object type="cutscene_camera" model="" xyz="-144.43 3.58 29.92" hpr="-100.4 74.5 -1.2" scale="1.00 1.00 1.00" interaction="ghost"> <curve channel="LocX" interpolation="bezier" extend="const"> <p c="0.000 -144.430" h1="-38.575 -144.430" h2="38.575 -144.430"/> @@ -677,8 +800,12 @@ <p c="372.000 -87.570" h1="358.336 -87.570" h2="421.192 -87.570"/> <p c="498.000 -87.654" h1="448.812 -87.570" h2="548.360 -87.741"/> <p c="627.000 -90.620" h1="576.639 -90.620" h2="645.739 -90.620"/> - <p c="675.000 -88.670" h1="656.264 -88.670" h2="743.698 -88.670"/> - <p c="851.000 -88.670" h1="782.296 -88.670" h2="870.909 -88.670"/> + <p c="675.000 -88.670" h1="656.264 -88.670" h2="684.758 -88.670"/> + <p c="700.000 -88.670" h1="699.768 -88.670" h2="700.046 -88.670"/> + <p c="700.124 -88.745" h1="700.077 -88.736" h2="700.357 -88.789"/> + <p c="845.000 -88.789" h1="844.766 -88.745" h2="845.048 -88.798"/> + <p c="845.124 -88.856" h1="845.077 -88.856" h2="845.359 -88.856"/> + <p c="851.000 -88.670" h1="848.706 -88.670" h2="862.470 -88.670"/> <p c="902.000 -90.255" h1="882.108 -90.255" h2="912.921 -90.255"/> <p c="930.000 -86.957" h1="919.143 -86.957" h2="940.857 -86.957"/> </curve> @@ -691,8 +818,12 @@ <p c="372.000 61.335" h1="358.372 61.335" h2="421.061 61.335"/> <p c="498.000 62.772" h1="448.859 61.335" h2="548.335 64.244"/> <p c="627.000 73.038" h1="576.644 73.038" h2="645.737 73.038"/> - <p c="675.000 67.618" h1="656.290 67.618" h2="743.603 67.618"/> - <p c="851.000 67.618" h1="782.378 67.618" h2="870.885 67.618"/> + <p c="675.000 67.618" h1="656.290 67.618" h2="684.745 67.618"/> + <p c="700.000 67.618" h1="699.997 67.618" h2="700.001 67.618"/> + <p c="700.124 46.934" h1="700.121 46.982" h2="700.127 46.886"/> + <p c="845.000 46.886" h1="844.997 46.886" h2="845.001 46.886"/> + <p c="845.124 67.478" h1="845.123 67.429" h2="845.127 67.618"/> + <p c="851.000 67.618" h1="848.711 67.478" h2="862.448 68.323"/> <p c="902.000 72.855" h1="882.089 72.855" h2="912.932 72.855"/> <p c="930.000 69.927" h1="919.128 69.927" h2="940.872 69.927"/> </curve> @@ -705,8 +836,12 @@ <p c="372.000 7.899" h1="358.336 7.899" h2="421.192 7.899"/> <p c="498.000 7.899" h1="448.808 7.899" h2="548.363 7.899"/> <p c="627.000 7.899" h1="576.639 7.899" h2="645.739 7.899"/> - <p c="675.000 8.748" h1="656.261 8.748" h2="743.710 8.748"/> - <p c="851.000 8.748" h1="782.293 8.748" h2="870.910 8.748"/> + <p c="675.000 8.748" h1="656.261 8.748" h2="684.760 8.748"/> + <p c="700.000 8.748" h1="699.989 8.748" h2="700.002 8.748"/> + <p c="700.124 3.178" h1="700.122 3.178" h2="700.135 3.178"/> + <p c="845.000 3.197" h1="844.989 3.178" h2="845.021 3.236"/> + <p c="845.124 8.750" h1="845.122 8.750" h2="845.135 8.750"/> + <p c="851.000 8.748" h1="848.706 8.750" h2="862.469 8.735"/> <p c="902.000 7.521" h1="882.141 8.748" h2="912.910 6.847"/> <p c="930.000 4.126" h1="919.148 4.126" h2="940.852 4.126"/> </curve> @@ -719,8 +854,12 @@ <p c="372.000 -80.615" h1="358.336 -80.615" h2="421.192 -80.615"/> <p c="498.000 -80.615" h1="448.808 -80.615" h2="548.363 -80.615"/> <p c="627.000 -80.615" h1="576.637 -80.615" h2="645.740 -80.615"/> - <p c="675.000 -79.146" h1="656.260 -79.146" h2="743.712 -79.146"/> - <p c="851.000 -79.146" h1="782.288 -79.146" h2="870.911 -79.146"/> + <p c="675.000 -79.146" h1="656.260 -79.146" h2="684.760 -79.146"/> + <p c="700.000 -79.146" h1="699.757 -79.146" h2="700.049 -79.146"/> + <p c="700.124 -79.146" h1="700.076 -79.146" h2="700.367 -79.146"/> + <p c="845.000 -79.146" h1="844.758 -79.146" h2="845.048 -79.146"/> + <p c="845.124 -79.146" h1="845.076 -79.146" h2="845.367 -79.146"/> + <p c="851.000 -79.146" h1="848.706 -79.146" h2="862.470 -79.146"/> <p c="902.000 -86.900" h1="882.089 -83.482" h2="912.931 -88.777"/> <p c="930.000 -92.257" h1="919.069 -92.257" h2="940.931 -92.257"/> </curve> @@ -733,8 +872,12 @@ <p c="372.000 0.000" h1="358.336 0.000" h2="421.192 0.000"/> <p c="498.000 0.000" h1="448.808 0.000" h2="548.363 0.000"/> <p c="627.000 0.000" h1="576.637 0.000" h2="645.740 0.000"/> - <p c="675.000 6.711" h1="656.260 6.711" h2="743.712 6.711"/> - <p c="851.000 -0.000" h1="782.288 -0.000" h2="870.911 -0.000"/> + <p c="675.000 6.711" h1="656.260 6.711" h2="684.760 6.711"/> + <p c="700.000 6.410" h1="699.757 6.438" h2="700.049 6.404"/> + <p c="700.124 6.382" h1="700.076 6.389" h2="700.367 6.350"/> + <p c="845.000 0.021" h1="844.758 0.034" h2="845.048 0.018"/> + <p c="845.124 0.013" h1="845.076 0.014" h2="845.367 0.005"/> + <p c="851.000 -0.000" h1="848.706 -0.000" h2="862.470 -0.000"/> <p c="902.000 1.076" h1="882.089 1.076" h2="912.932 1.076"/> <p c="930.000 -1.299" h1="919.068 -1.299" h2="940.932 -1.299"/> </curve> @@ -747,8 +890,12 @@ <p c="372.000 -171.619" h1="358.336 -171.619" h2="421.192 -171.619"/> <p c="498.000 -164.829" h1="448.808 -164.829" h2="548.363 -164.829"/> <p c="627.000 -170.457" h1="576.637 -164.829" h2="645.740 -172.551"/> - <p c="675.000 -180.427" h1="656.260 -180.427" h2="743.712 -180.427"/> - <p c="851.000 -180.427" h1="782.288 -180.427" h2="870.911 -180.427"/> + <p c="675.000 -180.427" h1="656.260 -180.427" h2="684.760 -180.427"/> + <p c="700.000 -180.427" h1="699.757 -180.427" h2="700.049 -180.427"/> + <p c="700.124 -180.427" h1="700.076 -180.427" h2="700.367 -180.427"/> + <p c="845.000 -180.427" h1="844.758 -180.427" h2="845.048 -180.427"/> + <p c="845.124 -180.427" h1="845.076 -180.427" h2="845.367 -180.427"/> + <p c="851.000 -180.427" h1="848.706 -180.427" h2="862.470 -180.427"/> <p c="902.000 -169.309" h1="882.089 -175.977" h2="912.931 -165.649"/> <p c="930.000 -156.660" h1="919.069 -156.660" h2="940.931 -156.660"/> </curve> @@ -761,8 +908,12 @@ <p c="372.000 1.000" h1="358.336 1.000" h2="421.192 1.000"/> <p c="498.000 1.000" h1="448.808 1.000" h2="548.363 1.000"/> <p c="627.000 1.000" h1="576.637 1.000" h2="645.740 1.000"/> - <p c="675.000 1.000" h1="656.260 1.000" h2="743.712 1.000"/> - <p c="851.000 1.000" h1="782.288 1.000" h2="870.911 1.000"/> + <p c="675.000 1.000" h1="656.260 1.000" h2="684.760 1.000"/> + <p c="700.000 1.000" h1="699.757 1.000" h2="700.049 1.000"/> + <p c="700.124 1.000" h1="700.076 1.000" h2="700.367 1.000"/> + <p c="845.000 1.000" h1="844.758 1.000" h2="845.048 1.000"/> + <p c="845.124 1.000" h1="845.076 1.000" h2="845.367 1.000"/> + <p c="851.000 1.000" h1="848.706 1.000" h2="862.470 1.000"/> <p c="902.000 1.000" h1="882.089 1.000" h2="912.932 1.000"/> <p c="930.000 1.000" h1="919.068 1.000" h2="940.932 1.000"/> </curve> @@ -775,8 +926,12 @@ <p c="372.000 1.000" h1="358.336 1.000" h2="421.192 1.000"/> <p c="498.000 1.000" h1="448.808 1.000" h2="548.363 1.000"/> <p c="627.000 1.000" h1="576.637 1.000" h2="645.740 1.000"/> - <p c="675.000 1.000" h1="656.260 1.000" h2="743.712 1.000"/> - <p c="851.000 1.000" h1="782.288 1.000" h2="870.911 1.000"/> + <p c="675.000 1.000" h1="656.260 1.000" h2="684.760 1.000"/> + <p c="700.000 1.000" h1="699.757 1.000" h2="700.049 1.000"/> + <p c="700.124 1.000" h1="700.076 1.000" h2="700.367 1.000"/> + <p c="845.000 1.000" h1="844.758 1.000" h2="845.048 1.000"/> + <p c="845.124 1.000" h1="845.076 1.000" h2="845.367 1.000"/> + <p c="851.000 1.000" h1="848.706 1.000" h2="862.470 1.000"/> <p c="902.000 1.000" h1="882.089 1.000" h2="912.932 1.000"/> <p c="930.000 1.000" h1="919.068 1.000" h2="940.932 1.000"/> </curve> @@ -789,8 +944,12 @@ <p c="372.000 1.000" h1="358.336 1.000" h2="421.192 1.000"/> <p c="498.000 1.000" h1="448.808 1.000" h2="548.363 1.000"/> <p c="627.000 1.000" h1="576.637 1.000" h2="645.740 1.000"/> - <p c="675.000 1.000" h1="656.260 1.000" h2="743.712 1.000"/> - <p c="851.000 1.000" h1="782.288 1.000" h2="870.911 1.000"/> + <p c="675.000 1.000" h1="656.260 1.000" h2="684.760 1.000"/> + <p c="700.000 1.000" h1="699.757 1.000" h2="700.049 1.000"/> + <p c="700.124 1.000" h1="700.076 1.000" h2="700.367 1.000"/> + <p c="845.000 1.000" h1="844.758 1.000" h2="845.048 1.000"/> + <p c="845.124 1.000" h1="845.076 1.000" h2="845.367 1.000"/> + <p c="851.000 1.000" h1="848.706 1.000" h2="862.470 1.000"/> <p c="902.000 1.000" h1="882.089 1.000" h2="912.932 1.000"/> <p c="930.000 1.000" h1="919.068 1.000" h2="940.932 1.000"/> </curve> Added: main/trunk/data/tracks/introcutscene/spaceship_engine.ogg =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/introcutscene/spaceship_engine.ogg ___________________________________________________________________ Added: svn:mime-type + application/ogg Added: main/trunk/data/tracks/introcutscene/spaceship_engine_short.ogg =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/introcutscene/spaceship_engine_short.ogg ___________________________________________________________________ Added: svn:mime-type + application/ogg Deleted: main/trunk/data/tracks/introcutscene/tapis.png =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/introcutscene2/intro2.music =================================================================== (Binary files differ) Added: main/trunk/data/tracks/introcutscene2/license.txt =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/introcutscene2/license.txt ___________________________________________________________________ Added: svn:mime-type + application/xml Deleted: main/trunk/data/tracks/introcutscene2/nolok_character.png =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/introcutscene2/nolok_speech.ogg =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/introcutscene2/scene.xml =================================================================== (Binary files differ) Added: main/trunk/data/tracks/introcutscene2/spaceship.ogg =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/introcutscene2/spaceship.ogg ___________________________________________________________________ Added: svn:mime-type + application/ogg Added: main/trunk/data/tracks/introcutscene2/spaceship_engine_short.ogg =================================================================== (Binary files differ) Property changes on: main/trunk/data/tracks/introcutscene2/spaceship_engine_short.ogg ___________________________________________________________________ Added: svn:mime-type + application/ogg Modified: main/trunk/data/tracks/overworld/overworld_track.b3d =================================================================== (Binary files differ) Modified: main/trunk/data/tracks/overworld/scene.xml =================================================================== --- main/trunk/data/tracks/overworld/scene.xml 2012-09-30 19:55:33 UTC (rev 11639) +++ main/trunk/data/tracks/overworld/scene.xml 2012-09-30 19:55:58 UTC (rev 11640) @@ -51,6 +51,7 @@ <static-object model="crystal_ball.b3d" xyz="146.39 3.20 -19.86" hpr="0.0 36.6 0.0" scale="0.86 0.78 0.86" challenge="snowpeak"/> <!-- writeStaticObjects 3 --> <static-object model="crystal_ball.b3d" xyz="28.92 -31.76 531.90" hpr="-0.0 -53.4 0.0" scale="0.86 0.78 0.86" challenge="fortmagma"/> <!-- writeStaticObjects 3 --> <static-object model="crystal_ball.b3d" xyz="48.49 -21.01 463.34" hpr="-0.0 -53.4 0.0" scale="0.86 0.78 0.86" challenge="xr591"/> <!-- writeStaticObjects 3 --> + <static-object model="crystal_ball.b3d" xyz="-3.28 -3.71 138.04" hpr="-4.8 -152.5 3.0" scale="0.86 0.78 0.86" challenge="gp1"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="pedestral" xyz="-94.90 -5.74 296.61" hpr="0.0 -29.6 0.0" scale="0.71 0.71 0.71"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="pedestral" xyz="40.01 -1.58 17.58" hpr="0.0 1.5 0.0" scale="0.71 0.71 0.71"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="pedestral" xyz="-19.62 -5.37 29.87" hpr="7.8 0.0 0.0" scale="0.68 0.68 0.68"/> <!-- writeStaticObjects 3 --> @@ -69,6 +70,7 @@ <static-object lod_instance="true" lod_group="pedestral" xyz="145.92 0.63 -19.89" hpr="0.5 2.0 -11.1" scale="0.71 0.71 0.71"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="pedestral" xyz="28.92 -34.33 531.93" hpr="0.0 -88.4 0.0" scale="0.71 0.71 0.71"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="pedestral" xyz="48.48 -23.57 463.37" hpr="0.0 -88.4 0.0" scale="0.71 0.71 0.71"/> <!-- writeStaticObjects 3 --> + <static-object lod_instance="true" lod_group="pedestral" xyz="-3.28 -6.27 137.83" hpr="-4.3 172.6 0.2" scale="0.71 0.71 0.71"/> <!-- writeStaticObjects 3 --> <static-object model="mountainTrees2.b3d" xyz="124.01 5.74 20.26" hpr="-87.5 -44.6 16.3" scale="0.78 0.78 0.78"/> <!-- writeStaticObjects 3 --> <static-object model="mountainTrees.b3d" xyz="126.93 6.88 -8.96" hpr="-69.3 -47.7 -14.1" scale="0.78 0.78 0.78"/> <!-- writeStaticObjects 3 --> <static-object lod_distance="100.0" lod_group="pineLow" model="pineLow_LOD100.b3d" xyz="137.80 6.97 -30.23" hpr="-81.5 -45.3 -5.4" scale="0.78 0.78 0.78"/> <!-- writeStaticObjects 3 --> @@ -139,6 +141,9 @@ <static-object lod_instance="true" lod_group="bubble_rocket" xyz="45.01 -21.17 463.46" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object lod_distance="100.0" lod_group="bubble_rocket" model="bubble_rocket.b3d" xyz="54.49 -21.17 463.01" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> <static-object model="bubble_solid_sphere.b3d" xyz="44.18 -21.67 462.31" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00" if="trophies"/> <!-- writeStaticObjects 3 --> + <static-object lod_instance="true" lod_group="bubble_gp1" xyz="-2.61 -3.33 138.54" hpr="-15.9 -102.1 19.7" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> + <static-object lod_distance="100.0" lod_group="bubble_gp1" model="bubble_gp1.b3d" xyz="-1.83 20.59 129.23" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <!-- writeStaticObjects 3 --> + <static-object model="bubble_solid_sphere.b3d" xyz="2.26 -4.38 139.45" hpr="-4.3 -177.1 0.5" scale="1.00 1.00 1.00" if="trophies"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="tree_2" xyz="33.87 -5.40 270.62" hpr="0.0 -180.0 -0.0" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="tree_2" xyz="38.46 -5.14 243.89" hpr="-0.0 112.2 -0.0" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> <static-object lod_instance="true" lod_group="tree_2" xyz="6.61 -2.16 236.99" hpr="0.0 165.6 0.0" scale="1.20 1.20 1.20"/> <!-- writeStaticObjects 3 --> @@ -200,6 +205,8 @@ </object> <object type="sfx-emitter" sound="portal.ogg" rolloff="0.100" volume="1.0" max_dist="500.0" xyz="46.35 -22.78 461.39" hpr="-0.0 -90.0 0.0" scale="1.00 1.00 1.00" play-when-near="true" distance="1.7"> </object> + <object type="sfx-emitter" sound="portal.ogg" rolloff="0.100" volume="1.0" max_dist="500.0" xyz="-0.39 -5.66 138.62" hpr="-6.4 170.7 -10.4" scale="1.00 1.00 1.00" play-when-near="true" distance="1.7"> + </object> <object type="action-trigger" action="garage" distance="5.0" xyz="2.61 0.26 -21.81" hpr="0.0 -0.0 0.0" scale="1.00 1.00 1.00"/> <object type="movable" xyz="14.29 -17.74 428.10" hpr="-2.6 -2.2 -0.6" scale="0.92 0.92 0.92" model="cart.b3d" shape="box" mass="100.0"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |