supertuxkart-commit — SuperTuxKart Commit List, to which SVN log messages are posted.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(26) |
Sep
(41) |
Oct
(6) |
Nov
(33) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(60) |
Feb
(181) |
Mar
(71) |
Apr
(108) |
May
(332) |
Jun
(25) |
Jul
(51) |
Aug
(10) |
Sep
(101) |
Oct
(91) |
Nov
(125) |
Dec
(293) |
| 2009 |
Jan
(262) |
Feb
(119) |
Mar
(130) |
Apr
(107) |
May
(125) |
Jun
(113) |
Jul
(109) |
Aug
(182) |
Sep
(93) |
Oct
(123) |
Nov
(45) |
Dec
(147) |
| 2010 |
Jan
(215) |
Feb
(292) |
Mar
(223) |
Apr
(222) |
May
(114) |
Jun
(137) |
Jul
(116) |
Aug
(125) |
Sep
(338) |
Oct
(203) |
Nov
(449) |
Dec
(383) |
| 2011 |
Jan
(364) |
Feb
(202) |
Mar
(384) |
Apr
(327) |
May
(306) |
Jun
(323) |
Jul
(282) |
Aug
(294) |
Sep
(234) |
Oct
(143) |
Nov
(223) |
Dec
(241) |
| 2012 |
Jan
(243) |
Feb
(135) |
Mar
(145) |
Apr
(124) |
May
(91) |
Jun
(88) |
Jul
(95) |
Aug
(78) |
Sep
(120) |
Oct
(194) |
Nov
(260) |
Dec
(211) |
| 2013 |
Jan
(124) |
Feb
(93) |
Mar
(55) |
Apr
(127) |
May
(114) |
Jun
(220) |
Jul
(345) |
Aug
(218) |
Sep
(561) |
Oct
(200) |
Nov
(232) |
Dec
(271) |
| 2014 |
Jan
(441) |
Feb
(153) |
Mar
(265) |
Apr
(315) |
May
(333) |
Jun
(277) |
Jul
(285) |
Aug
(533) |
Sep
(605) |
Oct
(319) |
Nov
(356) |
Dec
(389) |
| 2015 |
Jan
(325) |
Feb
(384) |
Mar
(331) |
Apr
(64) |
May
(94) |
Jun
(126) |
Jul
(60) |
Aug
(127) |
Sep
(189) |
Oct
(142) |
Nov
(57) |
Dec
(89) |
| 2016 |
Jan
(89) |
Feb
(62) |
Mar
(102) |
Apr
(91) |
May
(172) |
Jun
(112) |
Jul
(142) |
Aug
(49) |
Sep
(98) |
Oct
(132) |
Nov
(72) |
Dec
(225) |
| 2017 |
Jan
(246) |
Feb
(107) |
Mar
(155) |
Apr
(96) |
May
(45) |
Jun
(42) |
Jul
(62) |
Aug
(191) |
Sep
(150) |
Oct
(101) |
Nov
(50) |
Dec
(35) |
| 2018 |
Jan
(100) |
Feb
(4) |
Mar
(19) |
Apr
(20) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(4) |
2
(17) |
3
(4) |
4
(14) |
5
(9) |
|
6
(16) |
7
(2) |
8
(20) |
9
(5) |
10
(1) |
11
(1) |
12
(4) |
|
13
(1) |
14
(27) |
15
(9) |
16
(48) |
17
(28) |
18
(3) |
19
(5) |
|
20
(18) |
21
(9) |
22
(4) |
23
(16) |
24
(9) |
25
(15) |
26
(14) |
|
27
(15) |
28
(8) |
29
(9) |
30
(22) |
31
(27) |
|
|
|
From: <asciimonster@us...> - 2011-03-14 22:20:16
|
Revision: 7900
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7900&view=rev
Author: asciimonster
Date: 2011-03-14 22:20:10 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
[stk_browser] Added indentation for conditional properties. Also fixed some 'inaccuracies' as noticed by Auria.
Modified Paths:
--------------
main/trunk/data/tracks/stk_browser.py
Modified: main/trunk/data/tracks/stk_browser.py
===================================================================
--- main/trunk/data/tracks/stk_browser.py 2011-03-14 22:03:06 UTC (rev 7899)
+++ main/trunk/data/tracks/stk_browser.py 2011-03-14 22:20:10 UTC (rev 7900)
@@ -121,8 +121,8 @@
"Sun":["ambient","diffuse","specular"],\
"Texture":["anisotropic","backface-culling","clampU","clampV","compositing","disable-z-write",\
"friction","ignore","light","max-speed","reset","slowdown-time","sphere",\
- "graphical-effect","sound-effect","surface", "below-surface",\
- "falling-effect", \
+ "graphical-effect","surface","below-surface",\
+ "falling-effect","sound-effect", \
"sfx:filename|sound-effect=yes",\
"sfx:name|sound-effect=yes",\
"sfx:rolloff|sound-effect=yes",\
@@ -282,7 +282,7 @@
# For picklist, add <name>:<valuelist> to lSTK_Picklist. The valuelist items are |-separated...
lSTK_Picklist = {"sky-type": "dome|box|simple",\
- "graphical-effect": "none|water|smoke",\
+ "graphical-effect": "none|water",\
"compositing": "none|blend|test|additive",\
"particle:condition": "skid|drive",\
"interaction": "none|ghost|static|move",\
@@ -758,9 +758,14 @@
if cur_prop_nr < self.property_cursor:
continue
+ #Apply background striation
if (cur_prop_nr % 2) > 0:
self.DrawBox(x,y-1,width,textheight+1)
+ #Apply indentation to conditional properties
+ if prop_name not in lSTKTypes2Properties[data.GetCurrentType()]:
+ x += pad
+
#Delete button
if prop_type not in [type_STATIC,type_TYPELIST]:
# Delete button no longer necessary
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 22:03:12
|
Revision: 7899
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7899&view=rev
Author: auria
Date: 2011-03-14 22:03:06 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Fixed glitch in scotland water
Modified Paths:
--------------
media/trunk/tracks/scotland/scotland.blend
Modified: media/trunk/tracks/scotland/scotland.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 22:02:43
|
Revision: 7898
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7898&view=rev
Author: auria
Date: 2011-03-14 22:02:37 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Water splash in scotland
Modified Paths:
--------------
main/trunk/data/tracks/scotland/scene.xml
main/trunk/data/tracks/scotland/scotland_track.b3d
Modified: main/trunk/data/tracks/scotland/scene.xml
===================================================================
--- main/trunk/data/tracks/scotland/scene.xml 2011-03-14 21:58:49 UTC (rev 7897)
+++ main/trunk/data/tracks/scotland/scene.xml 2011-03-14 22:02:37 UTC (rev 7898)
@@ -47,7 +47,6 @@
<static-object model="pinetree.b3d" xyz="29.207897 -3.124180 187.617279" hpr="-0.000702 180.537090 0.074900" scale="2.351285 2.351285 2.351285"/>
</track>
<water model="water1.b3d" xyz="85.811806 -7.296509 35.094959" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.10000000149"/>
- <water model="water1.001.b3d" xyz="85.811806 -9.307529 35.094959" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.10000000149"/>
<water model="water2.b3d" xyz="-37.457680 -4.810161 10.933683" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.0500000007451"/>
<object type="animation" model="nessy.b3d" xyz="148.605347 3.402345 -181.443665" hpr="-0.000000 -0.000000 -0.000000" scale="0.129744 0.129744 0.129744" >
<curve channel="LocY" interpolation="bezier" extend="const">
Modified: main/trunk/data/tracks/scotland/scotland_track.b3d
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 21:58:55
|
Revision: 7897
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7897&view=rev
Author: auria
Date: 2011-03-14 21:58:49 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Water splash in scotland
Added Paths:
-----------
media/trunk/tracks/scotland/seabed.png
Added: media/trunk/tracks/scotland/seabed.png
===================================================================
(Binary files differ)
Property changes on: media/trunk/tracks/scotland/seabed.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 21:58:28
|
Revision: 7896
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7896&view=rev
Author: auria
Date: 2011-03-14 21:58:21 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Water splash in scotland
Modified Paths:
--------------
main/trunk/data/tracks/scotland/materials.xml
main/trunk/data/tracks/scotland/scene.xml
main/trunk/data/tracks/scotland/water1.b3d
Added Paths:
-----------
main/trunk/data/tracks/scotland/seabed.png
Modified: main/trunk/data/tracks/scotland/materials.xml
===================================================================
--- main/trunk/data/tracks/scotland/materials.xml 2011-03-14 21:25:18 UTC (rev 7895)
+++ main/trunk/data/tracks/scotland/materials.xml 2011-03-14 21:58:21 UTC (rev 7896)
@@ -10,8 +10,12 @@
<material name="Mossy_wall.png" anisotropic="Y"/>
<material name="rock_darkgrey.png" anisotropic="Y"/>
<material name="rock_grey.png" anisotropic="Y"/>
+ <material name="seabed.png" graphical-effect="water" falling-effect="Y"/>
<material name="tree_1.png" backface-culling="N" light="N" compositing="blend"/>
- <material name="water_dark.png" light="N" reset="Y"/>
+ <material name="water_dark.png" light="N" reset="Y" surface="Y">
+ <sfx filename="splash.ogg" name="splash"/>
+ <particles base="splash.xml" condition="skid drive"/>
+ </material>
<material name="Window4.png" anisotropic="Y"/>
<material name="Window5.png" anisotropic="Y"/>
<material name="Window6.png" anisotropic="Y"/>
Modified: main/trunk/data/tracks/scotland/scene.xml
===================================================================
--- main/trunk/data/tracks/scotland/scene.xml 2011-03-14 21:25:18 UTC (rev 7895)
+++ main/trunk/data/tracks/scotland/scene.xml 2011-03-14 21:58:21 UTC (rev 7896)
@@ -47,6 +47,7 @@
<static-object model="pinetree.b3d" xyz="29.207897 -3.124180 187.617279" hpr="-0.000702 180.537090 0.074900" scale="2.351285 2.351285 2.351285"/>
</track>
<water model="water1.b3d" xyz="85.811806 -7.296509 35.094959" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.10000000149"/>
+ <water model="water1.001.b3d" xyz="85.811806 -9.307529 35.094959" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.10000000149"/>
<water model="water2.b3d" xyz="-37.457680 -4.810161 10.933683" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.0500000007451"/>
<object type="animation" model="nessy.b3d" xyz="148.605347 3.402345 -181.443665" hpr="-0.000000 -0.000000 -0.000000" scale="0.129744 0.129744 0.129744" >
<curve channel="LocY" interpolation="bezier" extend="const">
Added: main/trunk/data/tracks/scotland/seabed.png
===================================================================
(Binary files differ)
Property changes on: main/trunk/data/tracks/scotland/seabed.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Modified: main/trunk/data/tracks/scotland/water1.b3d
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 21:25:25
|
Revision: 7895
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7895&view=rev
Author: auria
Date: 2011-03-14 21:25:18 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Remove files from media repo that don't belong there
Removed Paths:
-------------
media/trunk/tracks/mines/graph.xml
media/trunk/tracks/mines/quads.xml
media/trunk/tracks/mines/scene.xml
media/trunk/tracks/mines/track.xml
Deleted: media/trunk/tracks/mines/graph.xml
===================================================================
--- media/trunk/tracks/mines/graph.xml 2011-03-14 21:20:49 UTC (rev 7894)
+++ media/trunk/tracks/mines/graph.xml 2011-03-14 21:25:18 UTC (rev 7895)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7732 -->
-<graph>
- <!-- First define all nodes of the graph, and what quads they represent -->
- <node-list from-quad="0" to-quad="148"/> <!-- map each quad to a node -->
- <!-- Define the main loop -->
- <edge-loop from="0" to="148"/>
-</graph>
Deleted: media/trunk/tracks/mines/quads.xml
===================================================================
--- media/trunk/tracks/mines/quads.xml 2011-03-14 21:20:49 UTC (rev 7894)
+++ media/trunk/tracks/mines/quads.xml 2011-03-14 21:25:18 UTC (rev 7895)
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7732 -->
-<quads>
- <!-- Driveline: lines -->
- <quad p0="-4.190964 0.121380 8.836365" p1="4.349243 0.121380 8.381012" p2="4.324749 -0.362236 21.506195" p3="-3.087227 -0.362236 22.692078"/>
- <quad p0="0:3" p1="0:2" p2="6.250961 -0.517796 28.984375" p3="-0.521042 -0.517796 31.265015"/>
- <quad p0="1:3" p1="1:2" p2="9.741280 -0.812038 35.925873" p3="3.367832 -0.812038 39.390320"/>
- <quad p0="2:3" p1="2:2" p2="14.214485 -1.315365 41.194824" p3="9.689510 -1.315365 46.526001"/>
- <quad p0="3:3" p1="3:2" p2="20.865479 -1.818691 43.692993" p3="18.332024 -1.818691 51.603333"/>
- <quad p0="4:3" p1="4:2" p2="28.449629 -1.964115 44.856689" p3="27.723068 -1.964115 53.082916"/>
- <quad p0="5:3" p1="5:2" p2="35.643120 -2.109543 44.220001" p3="36.701172 -2.109543 52.586060"/>
- <quad p0="6:3" p1="6:2" p2="52.440372 -1.954422 40.306335" p3="54.372948 -1.954422 48.566406"/>
- <quad p0="7:3" p1="7:2" p2="69.538101 -1.481190 36.886810" p3="71.470680 -1.481190 45.146881"/>
- <quad p0="8:3" p1="8:2" p2="88.961128 -0.906563 32.783325" p3="90.893707 -0.906563 41.043427"/>
- <quad p0="9:3" p1="9:2" p2="105.101379 -0.365311 28.406342" p3="107.033958 -0.365311 36.666412"/>
- <quad p0="10:3" p1="10:2" p2="123.930954 -0.676121 20.150818" p3="126.503311 -0.676121 28.234558"/>
- <quad p0="11:3" p1="11:2" p2="136.587814 -1.374504 12.400299" p3="140.108582 -1.374504 20.118317"/>
- <quad p0="12:3" p1="12:2" p2="148.531982 -1.374504 2.687103" p3="154.152954 -1.374504 9.040741"/>
- <quad p0="13:3" p1="13:2" p2="155.276932 -1.374504 -8.064148" p3="162.727570 -1.374504 -4.008087"/>
- <quad p0="14:3" p1="14:2" p2="158.934311 -1.340279 -20.749542" p3="167.003510 -1.340279 -18.131943"/>
- <quad p0="15:3" p1="15:2" p2="163.034317 -0.636654 -37.958130" p3="170.563324 -0.636654 -35.939499"/>
- <quad p0="16:3" p1="16:2" p2="163.866913 -0.476276 -41.486343" p3="171.157196 -0.476276 -40.771149"/>
- <quad p0="17:3" p1="17:2" p2="166.576111 -0.476276 -60.087326" p3="173.906860 -0.476276 -60.085800"/>
- <quad p0="18:3" p1="18:2" p2="167.154709 -0.942566 -67.244553" p3="174.468185 -0.942566 -67.747467"/>
- <quad p0="19:3" p1="19:2" p2="166.358398 -2.270878 -75.383850" p3="173.539642 -2.270878 -76.856766"/>
- <quad p0="20:3" p1="20:2" p2="164.470337 -3.678112 -82.959335" p3="171.440231 -3.678112 -85.230988"/>
- <quad p0="21:3" p1="21:2" p2="161.030579 -4.432167 -89.386520" p3="167.759644 -4.432167 -92.295074"/>
- <quad p0="22:3" p1="22:2" p2="158.895905 -4.737457 -92.331635" p3="164.983826 -4.737457 -95.846970"/>
- <quad p0="23:3" p1="23:2" p2="156.439331 -5.042747 -94.557129" p3="159.981308 -5.042744 -99.964783"/>
- <quad p0="24:3" p1="24:2" p2="152.261215 -5.531475 -95.816177" p3="155.661118 -5.531475 -101.479660"/>
- <quad p0="25:3" p1="25:2" p2="147.761230 -6.020199 -96.355621" p3="149.114197 -6.020199 -103.560425"/>
- <quad p0="26:3" p1="26:2" p2="138.209732 -6.678623 -96.871384" p3="138.717163 -6.678623 -104.184555"/>
- <quad p0="27:3" p1="27:2" p2="130.589676 -7.021961 -95.135315" p3="129.736511 -7.021961 -103.153885"/>
- <quad p0="28:3" p1="28:2" p2="126.057800 -7.381542 -94.421127" p3="125.769676 -7.381542 -102.459946"/>
- <quad p0="29:3" p1="29:2" p2="121.724289 -7.741123 -94.146698" p3="122.001198 -7.741123 -102.205780"/>
- <quad p0="30:3" p1="30:2" p2="116.336929 -7.577957 -94.791550" p3="117.600708 -7.577957 -102.692764"/>
- <quad p0="31:3" p1="31:2" p2="111.192017 -7.414799 -96.102966" p3="113.442657 -7.414799 -103.846329"/>
- <quad p0="32:3" p1="32:2" p2="102.941246 -6.678627 -102.424484" p3="108.136215 -6.678627 -108.591965"/>
- <quad p0="33:3" p1="33:2" p2="100.354767 -6.678627 -107.103806" p3="106.391289 -6.678627 -112.296021"/>
- <quad p0="34:3" p1="34:2" p2="97.569832 -6.678627 -111.518921" p3="104.431267 -6.678627 -115.755219"/>
- <quad p0="35:3" p1="35:2" p2="94.600983 -7.304886 -114.121460" p3="100.390396 -7.304886 -119.477493"/>
- <quad p0="36:3" p1="36:2" p2="90.822723 -8.040058 -116.975266" p3="95.353683 -8.040058 -123.645782"/>
- <quad p0="37:3" p1="37:2" p2="81.931190 -8.725651 -122.030441" p3="85.984459 -8.725651 -127.997696"/>
- <quad p0="38:3" p1="38:2" p2="77.475319 -8.927422 -125.094269" p3="82.331802 -8.927422 -130.561874"/>
- <quad p0="39:3" p1="39:2" p2="74.047348 -9.133270 -129.313187" p3="79.383202 -9.133270 -133.920731"/>
- <quad p0="40:3" p1="40:2" p2="72.057678 -8.556747 -134.625214" p3="78.874695 -8.556747 -138.695068"/>
- <quad p0="41:3" p1="41:2" p2="70.971565 -7.968578 -140.662445" p3="78.016525 -7.968578 -143.319061"/>
- <quad p0="42:3" p1="42:2" p2="68.486046 -7.323605 -144.320282" p3="75.403732 -7.323605 -147.823181"/>
- <quad p0="43:3" p1="43:2" p2="65.744247 -6.678627 -147.835724" p3="72.606857 -6.678627 -152.231171"/>
- <quad p0="44:3" p1="44:2" p2="63.269554 -6.678627 -153.309296" p3="70.604622 -6.678627 -156.340561"/>
- <quad p0="45:3" p1="45:2" p2="62.068462 -6.678627 -158.839050" p3="69.948181 -6.678627 -160.552383"/>
- <quad p0="46:3" p1="46:2" p2="63.695045 -6.678627 -166.079926" p3="71.306313 -6.678627 -165.328186"/>
- <quad p0="47:3" p1="47:2" p2="66.163376 -6.678627 -173.471191" p3="73.489586 -6.678627 -170.101929"/>
- <quad p0="48:3" p1="48:2" p2="70.316254 -7.191547 -180.188599" p3="77.263435 -7.191547 -174.717606"/>
- <quad p0="49:3" p1="49:2" p2="75.133118 -7.988243 -186.231720" p3="81.701263 -7.988243 -178.659042"/>
- <quad p0="50:3" p1="50:2" p2="81.257477 -8.086716 -189.269440" p3="87.077789 -8.086716 -180.284180"/>
- <quad p0="51:3" p1="51:2" p2="87.458786 -8.175808 -191.235947" p3="92.602493 -8.175808 -180.972626"/>
- <quad p0="52:3" p1="52:2" p2="95.721924 -7.322411 -189.951965" p3="99.993134 -7.322411 -181.429504"/>
- <quad p0="53:3" p1="53:2" p2="102.168976 -6.678627 -189.587006" p3="105.571541 -6.678627 -182.797806"/>
- <quad p0="54:3" p1="54:2" p2="107.114754 -6.678623 -193.355530" p3="110.727768 -6.678623 -186.146393"/>
- <quad p0="55:3" p1="55:2" p2="113.042450 -6.678623 -197.822784" p3="116.655464 -6.678623 -190.613647"/>
- <quad p0="56:3" p1="56:2" p2="122.381348 -7.029312 -204.500214" p3="125.994370 -7.029312 -197.291107"/>
- <quad p0="57:3" p1="57:2" p2="126.601593 -7.151020 -206.686462" p3="129.026978 -7.229671 -197.806335"/>
- <quad p0="58:3" p1="58:2" p2="130.033142 -7.024677 -207.168869" p3="131.487640 -7.161076 -198.292023"/>
- <quad p0="59:3" p1="59:2" p2="134.987808 -7.028271 -207.543549" p3="137.380066 -7.157516 -199.703491"/>
- <quad p0="60:3" p1="60:2" p2="139.326263 -7.008480 -209.360046" p3="143.171646 -7.008480 -200.971512"/>
- <quad p0="61:3" p1="61:2" p2="143.212357 -7.027798 -211.507355" p3="148.545547 -7.146511 -204.112091"/>
- <quad p0="62:3" p1="62:2" p2="146.707397 -7.034756 -214.573669" p3="153.256042 -7.190220 -208.353378"/>
- <quad p0="63:3" p1="63:2" p2="149.598343 -7.008480 -217.916260" p3="157.049377 -7.008480 -213.473694"/>
- <quad p0="64:3" p1="64:2" p2="151.429688 -7.032394 -222.003433" p3="159.713318 -7.013180 -219.882080"/>
- <quad p0="65:3" p1="65:2" p2="151.857300 -7.061749 -225.762024" p3="160.093384 -7.019455 -226.257782"/>
- <quad p0="66:3" p1="66:2" p2="150.741302 -7.024719 -230.566132" p3="158.937988 -7.010986 -232.464081"/>
- <quad p0="67:3" p1="67:2" p2="148.865433 -7.008480 -236.764618" p3="157.785553 -7.008480 -239.364655"/>
- <quad p0="68:3" p1="68:2" p2="147.133698 -6.602695 -241.559235" p3="156.601685 -6.970142 -244.772675"/>
- <quad p0="69:3" p1="69:2" p2="145.615173 -6.082104 -245.932953" p3="154.152649 -6.972824 -250.476715"/>
- <quad p0="70:3" p1="70:2" p2="143.457260 -6.174751 -249.320953" p3="150.457397 -7.139420 -255.463562"/>
- <quad p0="71:3" p1="71:2" p2="140.375427 -6.639645 -251.975403" p3="146.078339 -7.454891 -259.606964"/>
- <quad p0="72:3" p1="72:2" p2="136.829239 -6.925865 -254.482239" p3="140.833618 -7.670490 -262.446991"/>
- <quad p0="73:3" p1="73:2" p2="132.380127 -7.200523 -255.902390" p3="135.439575 -7.901257 -265.048553"/>
- <quad p0="74:3" p1="74:2" p2="127.625938 -7.706123 -257.251862" p3="129.576080 -8.184761 -266.521637"/>
- <quad p0="75:3" p1="75:2" p2="122.518066 -8.233990 -258.136108" p3="123.569565 -8.504993 -267.386810"/>
- <quad p0="76:3" p1="76:2" p2="117.536850 -8.560772 -258.532135" p3="117.217453 -8.728863 -267.792938"/>
- <quad p0="77:3" p1="77:2" p2="110.871490 -10.821777 -257.498871" p3="108.642380 -10.846230 -267.327545"/>
- <quad p0="78:3" p1="78:2" p2="98.471191 -12.626202 -257.276703" p3="99.311279 -12.626202 -267.603790"/>
- <quad p0="79:3" p1="79:2" p2="89.625427 -12.755608 -260.434265" p3="93.263603 -12.755608 -269.824463"/>
- <quad p0="80:3" p1="80:2" p2="80.829208 -12.780743 -266.248962" p3="88.614349 -12.780743 -274.145599"/>
- <quad p0="81:3" p1="81:2" p2="75.580544 -12.885376 -274.758331" p3="84.968307 -12.885368 -280.943359"/>
- <quad p0="82:3" p1="82:2" p2="69.113281 -12.909405 -279.172546" p3="75.714706 -12.909405 -287.699249"/>
- <quad p0="83:3" p1="83:2" p2="61.426720 -12.882660 -280.254089" p3="63.750195 -12.882660 -290.754761"/>
- <quad p0="84:3" p1="84:2" p2="54.142551 -12.875305 -279.188202" p3="52.210701 -12.875313 -289.338440"/>
- <quad p0="85:3" p1="85:2" p2="48.368324 -13.049477 -275.079742" p3="42.046871 -13.049477 -282.980103"/>
- <quad p0="86:3" p1="86:2" p2="45.208080 -13.060867 -268.092865" p3="36.643379 -13.060875 -273.315277"/>
- <quad p0="87:3" p1="87:2" p2="43.758038 -12.979404 -260.427643" p3="34.525200 -12.979404 -263.139404"/>
- <quad p0="88:3" p1="88:2" p2="40.448158 -12.907310 -250.335938" p3="32.125923 -12.907310 -255.152100"/>
- <quad p0="89:3" p1="89:2" p2="35.329868 -12.748035 -242.262390" p3="27.491074 -12.748043 -248.714874"/>
- <quad p0="90:3" p1="90:2" p2="27.433693 -13.062279 -235.465759" p3="20.638599 -13.062279 -242.903763"/>
- <quad p0="91:3" p1="91:2" p2="19.812836 -13.442955 -231.620834" p3="15.910370 -13.599758 -240.691147"/>
- <quad p0="92:3" p1="92:2" p2="15.402264 -12.800663 -230.049866" p3="13.352299 -12.935139 -238.862991"/>
- <quad p0="93:3" p1="93:2" p2="9.669365 -12.171379 -227.661423" p3="7.414871 -12.171379 -237.433655"/>
- <quad p0="94:3" p1="94:2" p2="-2.361675 -12.223625 -225.296036" p3="-4.336662 -12.223633 -234.392136"/>
- <quad p0="95:3" p1="95:2" p2="-8.236656 -12.092083 -223.918152" p3="-10.112740 -12.223713 -233.321335"/>
- <quad p0="96:3" p1="96:2" p2="-14.072380 -11.074284 -222.313141" p3="-15.639755 -12.169876 -232.783447"/>
- <quad p0="97:3" p1="97:2" p2="-20.014885 -10.897907 -221.176300" p3="-20.428642 -12.096970 -232.755768"/>
- <quad p0="98:3" p1="98:2" p2="-25.901474 -10.543514 -221.194809" p3="-24.279686 -11.794098 -233.170364"/>
- <quad p0="99:3" p1="99:2" p2="-31.443398 -10.078903 -222.522552" p3="-27.356621 -11.329510 -233.895447"/>
- <quad p0="100:3" p1="100:2" p2="-36.473366 -9.546310 -225.051529" p3="-29.701782 -10.796902 -235.061020"/>
- <quad p0="101:3" p1="101:2" p2="-40.698936 -9.013729 -228.826996" p3="-31.482582 -10.264324 -236.643829"/>
- <quad p0="102:3" p1="102:2" p2="-43.817947 -8.549129 -233.692184" p3="-32.876167 -9.799709 -238.822632"/>
- <quad p0="103:3" p1="103:2" p2="-45.707130 -8.220512 -239.390045" p3="-33.880821 -9.471085 -241.876572"/>
- <quad p0="104:3" p1="104:2" p2="-46.410843 -8.095863 -245.789368" p3="-34.327164 -9.346436 -245.958878"/>
- <quad p0="105:3" p1="105:2" p2="-45.904465 -7.913887 -252.504440" p3="-33.988350 -9.164471 -250.491959"/>
- <quad p0="106:3" p1="106:2" p2="-44.183258 -7.434166 -258.957062" p3="-32.839333 -8.684765 -254.790604"/>
- <quad p0="107:3" p1="107:2" p2="-41.348160 -6.755936 -264.896820" p3="-30.986885 -8.006542 -258.676880"/>
- <quad p0="108:3" p1="108:2" p2="-37.458939 -5.978455 -270.121460" p3="-28.578918 -7.229050 -261.924561"/>
- <quad p0="109:3" p1="109:2" p2="-32.543808 -5.200974 -274.380615" p3="-25.794876 -6.451584 -264.355865"/>
- <quad p0="110:3" p1="110:2" p2="-26.650871 -4.522751 -277.334778" p3="-22.794334 -5.773338 -265.881775"/>
- <quad p0="111:3" p1="111:2" p2="-19.963676 -4.043037 -278.568756" p3="-19.601456 -5.293617 -266.489288"/>
- <quad p0="112:3" p1="112:2" p2="-13.106857 -4.155071 -277.806793" p3="-15.799225 -5.111656 -266.025665"/>
- <quad p0="113:3" p1="113:2" p2="-7.013557 -3.886620 -275.682678" p3="-12.018288 -5.137222 -264.682861"/>
- <quad p0="114:3" p1="114:2" p2="-2.003132 -3.953991 -272.741882" p3="-9.208313 -5.204586 -263.039825"/>
- <quad p0="115:3" p1="115:2" p2="2.027153 -4.048214 -268.930267" p3="-7.237633 -5.299839 -261.170898"/>
- <quad p0="116:3" p1="116:2" p2="4.978065 -4.893009 -264.524445" p3="-5.772659 -5.409031 -258.912109"/>
- <quad p0="117:3" p1="117:2" p2="6.749016 -5.494404 -257.740021" p3="-3.503853 -5.560974 -254.442245"/>
- <quad p0="118:3" p1="118:2" p2="8.024914 -5.680824 -250.046402" p3="-2.738102 -5.680832 -248.091202"/>
- <quad p0="119:3" p1="119:2" p2="7.924084 -5.706398 -244.240677" p3="-2.217575 -5.706387 -242.465027"/>
- <quad p0="120:3" p1="120:2" p2="8.776802 -5.643272 -240.112289" p3="-1.336853 -5.643272 -236.891449"/>
- <quad p0="121:3" p1="121:2" p2="13.766197 -5.643272 -228.054810" p3="4.843838 -5.643272 -224.333374"/>
- <quad p0="122:3" p1="122:2" p2="20.273792 -5.643272 -216.512131" p3="11.574863 -5.643272 -212.294739"/>
- <quad p0="123:3" p1="123:2" p2="25.031425 -5.643272 -207.617432" p3="16.332497 -5.643272 -203.400055"/>
- <quad p0="124:3" p1="124:2" p2="29.442009 -5.643272 -198.232452" p3="20.196049 -5.643272 -195.409332"/>
- <quad p0="125:3" p1="125:2" p2="30.540791 -5.643272 -189.912247" p3="20.958946 -5.643272 -188.629242"/>
- <quad p0="126:3" p1="126:2" p2="31.203209 -4.757137 -179.434982" p3="21.537647 -4.757137 -179.248566"/>
- <quad p0="127:3" p1="127:2" p2="30.866526 -3.666325 -171.175171" p3="21.253773 -3.666325 -172.201218"/>
- <quad p0="128:3" p1="128:2" p2="28.282740 -2.995792 -163.532501" p3="20.240376 -2.995792 -165.649597"/>
- <quad p0="129:3" p1="129:2" p2="26.209129 -2.239658 -154.774460" p3="18.257587 -2.239658 -158.401321"/>
- <quad p0="130:3" p1="130:2" p2="22.208668 -1.724174 -148.924561" p3="14.512753 -1.724174 -153.270386"/>
- <quad p0="131:3" p1="131:2" p2="17.364067 -1.228905 -143.551300" p3="10.347519 -1.228905 -148.318573"/>
- <quad p0="132:3" p1="132:2" p2="10.858040 -2.142380 -136.245453" p3="2.997795 -2.142380 -140.761566"/>
- <quad p0="133:3" p1="133:2" p2="4.973537 -3.020035 -128.941864" p3="-2.704926 -3.020035 -132.727432"/>
- <quad p0="134:3" p1="134:2" p2="-6.344757 -4.422508 -113.810410" p3="-13.159584 -4.422508 -117.906357"/>
- <quad p0="135:3" p1="135:2" p2="-11.526886 -4.338188 -105.000153" p3="-18.680504 -4.338188 -109.299713"/>
- <quad p0="136:3" p1="136:2" p2="-14.514771 -3.410439 -97.460587" p3="-21.940010 -3.410439 -100.053864"/>
- <quad p0="137:3" p1="137:2" p2="-15.416428 -2.692253 -92.306274" p3="-21.687950 -2.692253 -93.159698"/>
- <quad p0="138:3" p1="138:2" p2="-13.236038 -2.873112 -88.136688" p3="-20.529655 -2.873112 -87.658157"/>
- <quad p0="139:3" p1="139:2" p2="-10.453415 -3.306953 -77.089752" p3="-18.347794 -3.306953 -76.571808"/>
- <quad p0="140:3" p1="140:2" p2="-9.832893 -3.410435 -66.616501" p3="-16.899780 -3.410435 -66.152878"/>
- <quad p0="141:3" p1="141:2" p2="-7.160576 -3.226902 -59.075439" p3="-14.193909 -3.226902 -57.973114"/>
- <quad p0="142:3" p1="142:2" p2="-6.842316 -3.410435 -53.903870" p3="-12.029922 -3.410435 -53.008865"/>
- <quad p0="143:3" p1="143:2" p2="1.121170 -3.061573 -40.304993" p3="-4.686253 -3.061573 -39.303085"/>
- <quad p0="144:3" p1="144:2" p2="4.208767 -1.787888 -29.210648" p3="-3.636780 -1.787888 -28.057281"/>
- <quad p0="145:3" p1="145:2" p2="4.355148 -1.228451 -18.874573" p3="-4.196869 -1.228451 -18.949066"/>
- <quad p0="146:3" p1="146:2" p2="3.984596 -0.188778 -7.044281" p3="-4.567421 -0.188778 -7.118744"/>
- <quad p0="147:3" p1="147:2" p2="0:1" p3="0:0"/>
-</quads>
Deleted: media/trunk/tracks/mines/scene.xml
===================================================================
--- media/trunk/tracks/mines/scene.xml 2011-03-14 21:20:49 UTC (rev 7894)
+++ media/trunk/tracks/mines/scene.xml 2011-03-14 21:25:18 UTC (rev 7895)
@@ -1,205 +0,0 @@
-<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7732 -->
-<scene>
- <track model="mines_track.b3d" x="0" y="0" z="0">
- <static-object model="lamp1.b3d" xyz="73.528641 13.074365 48.170361" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="161.502914 7.478988 -107.907242" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="143.865448 6.647511 -100.245491" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="168.856140 9.253891 -79.728439" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="170.707306 10.760847 -63.890720" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="168.958984 11.384665 -50.469795" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="157.546051 13.074366 -16.822353" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="116.899506 13.074366 28.788658" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="105.005478 13.074366 4.690323" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="108.427666 14.674051 -103.164185" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="71.223145 12.105494 -147.481339" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="159.857437 8.453105 -98.240059" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="88.457588 11.017857 -122.450356" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="73.411636 9.969548 -178.667480" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="109.248344 9.689287 -190.293900" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="146.219971 5.575435 -251.086929" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="73.821991 11.134741 -236.799545" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="24.571163 6.142864 -235.444275" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="30.790829 6.631379 -260.637360" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="63.877815 9.689289 -286.835419" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="-0.059701 7.571029 -261.063019" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="-5.866757 5.199286 -232.113937" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="-35.005383 6.616151 -263.783356" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp1.b3d" xyz="111.166016 9.728848 -257.252960" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
- <static-object model="lamp2.b3d" xyz="19.816418 2.494591 47.446999" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="6.062208 3.472237 37.527607" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="0.590948 3.773987 21.827469" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="-0.122695 4.055372 8.387200" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="0.828829 2.999266 -21.347908" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="-18.274975 1.100022 -99.006973" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="0.341797 1.180715 -129.585236" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="8.623632 2.412237 -142.144073" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="21.843464 1.244174 -156.958069" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="26.042009 -0.737789 -180.670975" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="15.699359 -2.323852 -214.388016" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="154.920090 -2.760220 -231.799164" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="150.600708 -2.641747 -213.544617" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="134.454437 -2.560901 -203.003265" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <static-object model="lamp2.b3d" xyz="167.202408 6.402066 -38.893879" hpr="-0.000000 -0.000000 -0.000000" scale="0.582617 0.494681 0.582617"/>
- <animated-texture name="mine_water_alpha.png" dy="0.5" />
- <animated-texture name="mine_water_alpha.png" dy="0.5" />
- </track>
- <water model="water.b3d" xyz="99.244125 -14.704125 -150.551712" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.5"/>
- <object type="animation" model="cart.b3d" xyz="34.090733 1.353933 60.885803" hpr="-0.000000 33.594439 -0.000000" scale="1.000000 1.000000 1.000000" >
- <curve channel="LocX" interpolation="bezier" extend="cyclic">
- <p c="1.000000 34.090733" h1="-1.311990 30.471663" h2="3.311990 37.709801"/>
- <p c="12.000000 51.309566" h1="9.698393 47.683884" h2="14.720081 55.594463"/>
- <p c="25.000000 71.917366" h1="22.360723 67.582230" h2="30.075531 80.254166"/>
- <p c="50.000000 114.414307" h1="44.451099 106.384804" h2="55.548901 122.443810"/>
- <p c="75.000000 144.269592" h1="68.177727 137.289642" h2="81.822273 151.249542"/>
- <p c="100.000000 165.569916" h1="91.778740 160.309296" h2="108.221260 170.830536"/>
- <p c="125.000000 176.263596" h1="115.990257 172.510239" h2="128.603897 177.764938"/>
- <p c="135.000000 180.317902" h1="131.943268 177.889221" h2="139.585098 183.960922"/>
- <p c="150.000000 198.072540" h1="146.220657 193.599136" h2="153.779343 202.545944"/>
- </curve>
- <curve channel="LocZ" interpolation="bezier" extend="cyclic">
- <p c="1.000000 60.885803" h1="-2.939460 62.595661" h2="4.939460 59.175945"/>
- <p c="12.000000 56.111439" h1="7.974117 57.606506" h2="16.757862 54.344540"/>
- <p c="25.000000 52.098404" h1="20.233387 53.841553" h2="34.166565 48.746197"/>
- <p c="50.000000 41.530804" h1="41.357979 46.067177" h2="58.642021 36.994431"/>
- <p c="75.000000 25.852383" h1="67.012527 31.461611" h2="82.987473 20.243155"/>
- <p c="100.000000 6.418161" h1="93.386574 13.596308" h2="106.613426 -0.759985"/>
- <p c="125.000000 -28.417103" h1="119.748909 -20.189756" h2="127.100441 -31.708042"/>
- <p c="135.000000 -45.818737" h1="132.475464 -42.840675" h2="138.786804 -50.285831"/>
- <p c="150.000000 -55.105778" h1="145.020905 -52.023037" h2="154.979095 -58.188519"/>
- </curve>
- <curve channel="LocY" interpolation="bezier" extend="cyclic">
- <p c="0.677636 1.353674" h1="-3.616888 1.350085" h2="4.972161 1.357263"/>
- <p c="11.677636 1.362867" h1="7.384837 1.353674" h2="16.751232 1.373733"/>
- <p c="24.677637 2.089568" h1="19.607914 1.850643" h2="34.427105 2.549038"/>
- <p c="49.677635 3.048452" h1="39.917366 3.048452" h2="59.437904 3.048452"/>
- <p c="74.677635 2.187827" h1="64.921539 2.473740" h2="84.433731 1.901913"/>
- <p c="99.677635 1.583146" h1="89.917679 1.583146" h2="109.437592 1.583146"/>
- <p c="124.677635 2.600322" h1="114.923904 2.242718" h2="128.579132 2.743364"/>
- <p c="134.677643 2.926717" h1="130.774216 2.853278" h2="140.532639 3.036874"/>
- <p c="149.677643 3.036874" h1="143.821625 2.993869" h2="155.533661 3.079879"/>
- </curve>
- <curve channel="RotX" interpolation="bezier" extend="cyclic">
- <p c="1.000000 -0.000000" h1="-3.292610 -1.282800" h2="5.292610 1.282800"/>
- <p c="12.000000 3.287230" h1="7.705521 3.287230" h2="17.075294 3.287230"/>
- <p c="25.000000 -1.813755" h1="19.925627 -1.813755" h2="34.758411 -1.813755"/>
- <p c="50.000000 -1.813755" h1="40.239799 -1.813755" h2="59.760201 -1.813755"/>
- <p c="75.000000 -3.948703" h1="65.239746 -3.948703" h2="84.760254 -3.948703"/>
- <p c="100.000000 -3.128118" h1="90.239746 -3.389093" h2="109.760254 -2.867143"/>
- <p c="125.000000 -2.611777" h1="115.239716 -2.611777" h2="128.904114 -2.611777"/>
- <p c="135.000000 -2.611777" h1="131.095886 -2.611777" h2="140.856171 -2.611777"/>
- <p c="150.000000 -2.611777" h1="144.143829 -2.611777" h2="155.856171 -2.611777"/>
- </curve>
- <curve channel="RotZ" interpolation="bezier" extend="cyclic">
- <p c="1.000000 0.000000" h1="-3.294444 -0.265861" h2="5.294444 0.265861"/>
- <p c="12.000000 0.680990" h1="7.705473 0.680990" h2="17.075350 0.680990"/>
- <p c="25.000000 -0.153665" h1="19.924677 -0.153665" h2="34.760239 -0.153665"/>
- <p c="50.000000 -0.153665" h1="40.239746 -0.153665" h2="59.760254 -0.153665"/>
- <p c="75.000000 -1.426371" h1="65.239784 -1.060905" h2="84.760216 -1.791836"/>
- <p c="100.000000 -2.025884" h1="90.239723 -2.025884" h2="109.760277 -2.025884"/>
- <p c="125.000000 -0.570424" h1="115.239754 -0.570424" h2="128.904099 -0.570424"/>
- <p c="135.000000 -0.570424" h1="131.095886 -0.570424" h2="140.856171 -0.570424"/>
- <p c="150.000000 -0.570424" h1="144.143829 -0.570424" h2="155.856171 -0.570424"/>
- </curve>
- <curve channel="RotY" interpolation="bezier" extend="cyclic">
- <p c="1.000000 33.594439" h1="-3.211841 41.981068" h2="5.211841 25.207813"/>
- <p c="12.000000 11.691213" h1="7.719010 14.396528" h2="17.043915 8.503777"/>
- <p c="25.000000 8.503777" h1="19.924747 8.503777" h2="34.760101 8.503777"/>
- <p c="50.000000 17.732508" h1="40.249390 13.387465" h2="59.750610 22.077551"/>
- <p c="75.000000 30.784652" h1="65.265076 23.752835" h2="84.734924 37.816470"/>
- <p c="100.000000 53.848958" h1="90.283554 44.608049" h2="109.716446 63.089867"/>
- <p c="125.000000 78.337584" h1="115.253662 78.337584" h2="128.898544 78.337584"/>
- <p c="135.000000 57.839060" h1="131.278534 69.640980" h2="140.582184 40.136180"/>
- <p c="150.000000 -6.552599" h1="144.618698 16.548102" h2="155.381302 -29.653301"/>
- </curve>
- </object>
- <object type="animation" model="cogwheel1.b3d" xyz="153.402405 -4.630000 -105.631821" hpr="90.000003 -0.000000 -0.000000" scale="1.226275 1.226275 1.226275" >
- <curve channel="RotZ" interpolation="bezier" extend="cyclic">
- <p c="1.000000 0.000000" h1="-6.495901 56.219258" h2="8.495901 -56.219258"/>
- <p c="25.000000 -180.000000" h1="17.450090 -124.508162" h2="32.864491 -237.803993"/>
- <p c="50.000000 -360.000000" h1="42.079193 -302.970181" h2="57.920807 -417.029839"/>
- </curve>
- </object>
- <object type="animation" model="cogwheel3.b3d" xyz="97.249710 -6.796127 -209.367935" hpr="90.000003 -0.000000 -0.000000" scale="1.935402 1.935402 1.935402" >
- <curve channel="RotZ" interpolation="bezier" extend="cyclic">
- <p c="1.000000 0.000000" h1="-6.495901 56.219258" h2="8.495901 -56.219258"/>
- <p c="25.000000 -180.000000" h1="17.450090 -124.508162" h2="32.864491 -237.803993"/>
- <p c="50.000000 -360.000000" h1="42.079193 -302.970181" h2="57.920807 -417.029839"/>
- </curve>
- </object>
- <object type="animation" model="cogwheel4.b3d" xyz="98.500488 1.342495 -209.367935" hpr="90.000003 -360.000010 -270.000001" scale="1.484084 1.484085 1.484084" >
- <curve channel="RotZ" interpolation="bezier" extend="cyclic">
- <p c="1.000000 -270.000000" h1="-6.495901 -326.219254" h2="8.495901 -213.780746"/>
- <p c="25.000000 -90.000000" h1="17.450090 -145.491838" h2="32.864491 -32.196002"/>
- <p c="50.000000 90.000000" h1="42.079193 32.970176" h2="57.920807 147.029819"/>
- </curve>
- </object>
- <object type="animation" model="cogwheel2.b3d" xyz="97.249710 9.385337 -209.367935" hpr="90.000003 -0.000000 -0.000000" scale="1.919062 1.919063 1.919062" >
- <curve channel="RotZ" interpolation="bezier" extend="cyclic">
- <p c="1.000000 0.000000" h1="-6.495901 56.219258" h2="8.495901 -56.219258"/>
- <p c="25.000000 -180.000000" h1="17.450090 -124.508162" h2="32.864491 -237.803993"/>
- <p c="50.000000 -360.000000" h1="42.079193 -302.970181" h2="57.920807 -417.029839"/>
- </curve>
- </object>
- <sun fog="true" fog-color="3060 1530 0" fog-start="0" fog-end="50"/>
- <sky-color rgb="12 6 0"/>
- <banana x="100.780777" y="-0.404809" z="25.302782" />
- <small-nitro x="86.887367" y="-8.432766" z="-119.353081" h="-106.29825" />
- <banana x="155.707458" y="-1.364308" z="-11.022039" />
- <banana x="81.72654" y="-7.98826" z="-178.814423" />
- <banana x="150.685471" y="-6.548743" z="-230.603546" />
- <banana x="139.194443" y="-7.764452" z="-262.427246" />
- <banana x="133.866898" y="-6.812193" z="-252.906357" />
- <banana x="30.145292" y="-13.052706" z="-254.756149" />
- <banana x="55.568428" y="-12.856246" z="-289.658325" />
- <banana x="-17.512466" y="-5.886215" z="-264.772186" />
- <banana x="15.907364" y="-6.190219" z="-223.476105" />
- <banana x="-22.316296" y="-3.009805" z="-83.677521" />
- <banana x="-9.108026" y="-3.396055" z="-64.930992" />
- <banana x="3.575795" y="-1.88825" z="-29.859859" />
- <item x="-3.344819" y="-1.078701" z="-21.165035" />
- <item x="0.686488" y="-1.259496" z="-21.533941" />
- <item x="4.239828" y="-1.259496" z="-21.71883" />
- <item x="30.318827" y="-2.3464" z="45.62558" h="-106.29825" />
- <item x="31.652718" y="-2.3464" z="49.439526" h="-106.29825" />
- <item x="33.339497" y="-2.141098" z="53.715778" h="-106.29825" />
- <small-nitro x="164.371216" y="-0.544612" z="-39.135807" h="-106.29825" />
- <item x="160.891968" y="-4.905015" z="-96.477409" h="-106.29825" />
- <item x="158.719666" y="-4.862887" z="-94.141991" h="-106.29825" />
- <item x="90.641701" y="-8.432766" z="-125.209465" h="-106.29825" />
- <item x="88.96817" y="-8.432766" z="-122.333031" h="-106.29825" />
- <item x="4.494936" y="-5.731102" z="-240.152481" h="-106.29825" />
- <item x="148.528" y="-7.031413" z="-214.681549" h="-106.29825" />
- <item x="101.627129" y="-12.640284" z="-257.501373" h="-102.805974" />
- <item x="101.650658" y="-12.444284" z="-260.131866" h="-102.805974" />
- <small-nitro x="130.719467" y="-6.119966" z="-251.374237" h="-106.29825" />
- <small-nitro x="151.272125" y="-7.100279" z="-212.730133" h="-106.29825" />
- <small-nitro x="154.06749" y="-7.080575" z="-210.958328" h="-106.29825" />
- <item x="5.415504" y="-12.368757" z="-234.857178" h="-106.29825" />
- <item x="6.266859" y="-12.368757" z="-232.175369" h="-106.29825" />
- <item x="7.42998" y="-12.368757" z="-229.119888" h="-106.29825" />
- <item x="-0.497274" y="-5.583218" z="-238.60878" h="-106.29825" />
- <small-nitro x="-0.880662" y="-4.199795" z="-268.757172" h="-106.29825" />
- <small-nitro x="-13.830209" y="-4.360255" z="-275.728943" h="-106.29825" />
- <small-nitro x="4.633689" y="-5.500455" z="-257.90155" h="-106.29825" />
- <banana x="8.895861" y="-2.15898" z="-142.252762" />
- <small-nitro x="-16.469004" y="-3.248707" z="-57.896088" />
- <big-nitro x="5.776165" y="-3.233579" z="-49.575977" />
- <small-nitro x="91.072693" y="-8.16692" z="-181.98465" h="-165.587434" />
- <item x="87.954994" y="-8.16692" z="-188.203354" h="-165.587434" />
- <small-nitro x="57.389462" y="-12.954372" z="-279.979004" />
- <small-nitro x="101.586464" y="-12.444284" z="-263.358856" h="-102.805974" />
- <item x="101.242996" y="-12.540854" z="-267.065155" h="-102.805974" />
- <small-nitro x="6.976637" y="-5.731102" z="-240.754944" h="-106.29825" />
- <small-nitro x="1.848688" y="-5.583218" z="-239.460663" h="-106.29825" />
- <checks>
- <check-lap kind="lap" same-group="0" other-ids="1" />
- <check-line kind="activate" other-ids="0" p1="162.622131 -238.248413" p2="145.042297 -233.537903"
- min-height="-6.716766" same-group="1"/>
- </checks>
- <camera far="100.0"/>
- <default-start karts-per-row ="2"
- forwards-distance ="1.5"
- sidewards-distance="3"
- upwards-distance ="0.1"/>
-</scene>
Deleted: media/trunk/tracks/mines/track.xml
===================================================================
--- media/trunk/tracks/mines/track.xml 2011-03-14 21:20:49 UTC (rev 7894)
+++ media/trunk/tracks/mines/track.xml 2011-03-14 21:25:18 UTC (rev 7895)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7732 -->
-<track name = "Old Mine"
- version = "5"
- groups = "standard"
- designer = "Ivar ten Cate"
- music = "West.music"
- screenshot = "sshot-mines.jpg"
->
-</track>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 21:21:05
|
Revision: 7894
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7894&view=rev
Author: auria
Date: 2011-03-14 21:20:49 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
use water splash in mines
Modified Paths:
--------------
media/trunk/tracks/mines/graph.xml
media/trunk/tracks/mines/mines.blend
media/trunk/tracks/mines/quads.xml
media/trunk/tracks/mines/scene.xml
media/trunk/tracks/mines/track.xml
Modified: media/trunk/tracks/mines/graph.xml
===================================================================
--- media/trunk/tracks/mines/graph.xml 2011-03-14 21:20:31 UTC (rev 7893)
+++ media/trunk/tracks/mines/graph.xml 2011-03-14 21:20:49 UTC (rev 7894)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7092 -->
+<!-- Generated with script from SVN rev 7732 -->
<graph>
<!-- First define all nodes of the graph, and what quads they represent -->
<node-list from-quad="0" to-quad="148"/> <!-- map each quad to a node -->
Modified: media/trunk/tracks/mines/mines.blend
===================================================================
(Binary files differ)
Modified: media/trunk/tracks/mines/quads.xml
===================================================================
--- media/trunk/tracks/mines/quads.xml 2011-03-14 21:20:31 UTC (rev 7893)
+++ media/trunk/tracks/mines/quads.xml 2011-03-14 21:20:49 UTC (rev 7894)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7092 -->
+<!-- Generated with script from SVN rev 7732 -->
<quads>
<!-- Driveline: lines -->
- <quad p0="-4.190964 0.121380 8.836365" p1="4.349243 0.121380 8.381012" p2="4.324749 -0.362236 21.506195" p3="-3.087227 -0.362236 22.692078"/>
+ <quad p0="-4.190964 0.121380 8.836365" p1="4.349243 0.121380 8.381012" p2="4.324749 -0.362236 21.506195" p3="-3.087227 -0.362236 22.692078"/>
<quad p0="0:3" p1="0:2" p2="6.250961 -0.517796 28.984375" p3="-0.521042 -0.517796 31.265015"/>
<quad p0="1:3" p1="1:2" p2="9.741280 -0.812038 35.925873" p3="3.367832 -0.812038 39.390320"/>
<quad p0="2:3" p1="2:2" p2="14.214485 -1.315365 41.194824" p3="9.689510 -1.315365 46.526001"/>
Modified: media/trunk/tracks/mines/scene.xml
===================================================================
--- media/trunk/tracks/mines/scene.xml 2011-03-14 21:20:31 UTC (rev 7893)
+++ media/trunk/tracks/mines/scene.xml 2011-03-14 21:20:49 UTC (rev 7894)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7092 -->
+<!-- Generated with script from SVN rev 7732 -->
<scene>
<track model="mines_track.b3d" x="0" y="0" z="0">
<static-object model="lamp1.b3d" xyz="73.528641 13.074365 48.170361" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
@@ -44,6 +44,7 @@
<animated-texture name="mine_water_alpha.png" dy="0.5" />
<animated-texture name="mine_water_alpha.png" dy="0.5" />
</track>
+ <water model="water.b3d" xyz="99.244125 -14.704125 -150.551712" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.5"/>
<object type="animation" model="cart.b3d" xyz="34.090733 1.353933 60.885803" hpr="-0.000000 33.594439 -0.000000" scale="1.000000 1.000000 1.000000" >
<curve channel="LocX" interpolation="bezier" extend="cyclic">
<p c="1.000000 34.090733" h1="-1.311990 30.471663" h2="3.311990 37.709801"/>
@@ -140,6 +141,7 @@
<p c="50.000000 -360.000000" h1="42.079193 -302.970181" h2="57.920807 -417.029839"/>
</curve>
</object>
+ <sun fog="true" fog-color="3060 1530 0" fog-start="0" fog-end="50"/>
<sky-color rgb="12 6 0"/>
<banana x="100.780777" y="-0.404809" z="25.302782" />
<small-nitro x="86.887367" y="-8.432766" z="-119.353081" h="-106.29825" />
Modified: media/trunk/tracks/mines/track.xml
===================================================================
--- media/trunk/tracks/mines/track.xml 2011-03-14 21:20:31 UTC (rev 7893)
+++ media/trunk/tracks/mines/track.xml 2011-03-14 21:20:49 UTC (rev 7894)
@@ -1,7 +1,7 @@
-<!-- Generated with script from SVN rev 7092 -->
<?xml version="1.0"?>
+<!-- Generated with script from SVN rev 7732 -->
<track name = "Old Mine"
- version = "3"
+ version = "5"
groups = "standard"
designer = "Ivar ten Cate"
music = "West.music"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 21:20:40
|
Revision: 7893
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7893&view=rev
Author: auria
Date: 2011-03-14 21:20:31 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
use water splash in mines
Modified Paths:
--------------
main/trunk/data/tracks/mines/graph.xml
main/trunk/data/tracks/mines/materials.xml
main/trunk/data/tracks/mines/mines_track.b3d
main/trunk/data/tracks/mines/quads.xml
main/trunk/data/tracks/mines/scene.xml
main/trunk/data/tracks/mines/track.xml
Modified: main/trunk/data/tracks/mines/graph.xml
===================================================================
--- main/trunk/data/tracks/mines/graph.xml 2011-03-14 20:53:50 UTC (rev 7892)
+++ main/trunk/data/tracks/mines/graph.xml 2011-03-14 21:20:31 UTC (rev 7893)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 6539 -->
+<!-- Generated with script from SVN rev 7732 -->
<graph>
<!-- First define all nodes of the graph, and what quads they represent -->
<node-list from-quad="0" to-quad="148"/> <!-- map each quad to a node -->
Modified: main/trunk/data/tracks/mines/materials.xml
===================================================================
--- main/trunk/data/tracks/mines/materials.xml 2011-03-14 20:53:50 UTC (rev 7892)
+++ main/trunk/data/tracks/mines/materials.xml 2011-03-14 21:20:31 UTC (rev 7893)
@@ -1,25 +1,23 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 6539 -->
+<!-- Generated with script from SVN rev 7732 -->
<materials>
- <material name="candle.png" alpha="Y"/>
- <material name="clip.png" transparency="Y"/>
- <material name="fence_chain.png" transparency="Y" anisotropic="Y"/>
- <material name="mine_water_alpha.png" alpha="Y"/>
- <material name="mine_water_reset.png" alpha="Y" reset="Y"/>
- <material name="wood_beam.png">
- <sfx filename="wooden_bridge.ogg" name="wood" rolloff="0.6" min-speed="9.0" max-speed="22.0" min-pitch="1.0" max-pitch="1.7" positional="yes" volume="1.0"/>
- </material>
-
+ <material name="candle.png" alpha="yes" compositing="blend"/>
+ <material name="clip.png" transparency="yes" compositing="test"/>
+ <material name="fence_chain.png" transparency="yes" anisotropic="Y" compositing="test"/>
+ <material name="metal_rusted.jpg" anisotropic="Y"/>
<material name="mine_road.jpg" anisotropic="Y">
- <particles base="smoke.xml" condition="skid" />
+ <particles base="smoke.xml"/>
</material>
-
- <material name="wall_wood1.jpg" anisotropic="Y">
- <particles base="smoke.xml" condition="skid" />
+ <material name="mine_road.jpg">
+ <particles condition="skid" base="smoke.xml"/>
</material>
-
- <material name="mine_rock.jpg" anisotropic="Y" />
- <material name="mine_rock2.jpg" anisotropic="Y" />
- <material name="metal_rusted.jpg" anisotropic="Y" />
- <material name="mine_rail.jpg" anisotropic="Y" />
+ <material name="mine_rail.jpg" anisotropic="Y"/>
+ <material name="mine_rock2.jpg" slowdown-time="1.0" max-speed="1.0" backface-culling="Y" anisotropic="Y"/>
+ <material name="mine_rock.jpg" slowdown-time="1.0" max-speed="1.0" anisotropic="Y"/>
+ <material name="mine_water_alpha.png" compositing="blend" surface="Y" clampV="N" anisotropic="Y">
+ <sfx filename="splash.ogg" name="splash"/>
+ <particles base="splash.xml" condition="skid drive"/>
+ </material>
+ <material name="mine_water_reset.png" reset="Y" compositing="none" graphical-effect="water" falling-effect="Y"/>
+ <material name="wall_wood1.jpg" anisotropic="Y"/>
</materials>
Modified: main/trunk/data/tracks/mines/mines_track.b3d
===================================================================
(Binary files differ)
Modified: main/trunk/data/tracks/mines/quads.xml
===================================================================
--- main/trunk/data/tracks/mines/quads.xml 2011-03-14 20:53:50 UTC (rev 7892)
+++ main/trunk/data/tracks/mines/quads.xml 2011-03-14 21:20:31 UTC (rev 7893)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 6539 -->
+<!-- Generated with script from SVN rev 7732 -->
<quads>
<!-- Driveline: lines -->
- <quad p0="-4.190964 0.121380 8.836365" p1="4.349243 0.121380 8.381012" p2="4.324749 -0.362236 21.506195" p3="-3.087227 -0.362236 22.692078"/>
+ <quad p0="-4.190964 0.121380 8.836365" p1="4.349243 0.121380 8.381012" p2="4.324749 -0.362236 21.506195" p3="-3.087227 -0.362236 22.692078"/>
<quad p0="0:3" p1="0:2" p2="6.250961 -0.517796 28.984375" p3="-0.521042 -0.517796 31.265015"/>
<quad p0="1:3" p1="1:2" p2="9.741280 -0.812038 35.925873" p3="3.367832 -0.812038 39.390320"/>
<quad p0="2:3" p1="2:2" p2="14.214485 -1.315365 41.194824" p3="9.689510 -1.315365 46.526001"/>
Modified: main/trunk/data/tracks/mines/scene.xml
===================================================================
--- main/trunk/data/tracks/mines/scene.xml 2011-03-14 20:53:50 UTC (rev 7892)
+++ main/trunk/data/tracks/mines/scene.xml 2011-03-14 21:20:31 UTC (rev 7893)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 6539 -->
+<!-- Generated with script from SVN rev 7732 -->
<scene>
<track model="mines_track.b3d" x="0" y="0" z="0">
<static-object model="lamp1.b3d" xyz="73.528641 13.074365 48.170361" hpr="-0.000000 -0.000000 -0.000000" scale="0.812535 0.205050 0.812535"/>
@@ -44,6 +44,7 @@
<animated-texture name="mine_water_alpha.png" dy="0.5" />
<animated-texture name="mine_water_alpha.png" dy="0.5" />
</track>
+ <water model="water.b3d" xyz="99.244125 -14.704125 -150.551712" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.5"/>
<object type="animation" model="cart.b3d" xyz="34.090733 1.353933 60.885803" hpr="-0.000000 33.594439 -0.000000" scale="1.000000 1.000000 1.000000" >
<curve channel="LocX" interpolation="bezier" extend="cyclic">
<p c="1.000000 34.090733" h1="-1.311990 30.471663" h2="3.311990 37.709801"/>
Modified: main/trunk/data/tracks/mines/track.xml
===================================================================
--- main/trunk/data/tracks/mines/track.xml 2011-03-14 20:53:50 UTC (rev 7892)
+++ main/trunk/data/tracks/mines/track.xml 2011-03-14 21:20:31 UTC (rev 7893)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 6539 -->
+<!-- Generated with script from SVN rev 7732 -->
<track name = "Old Mine"
- version = "3"
+ version = "5"
groups = "standard"
designer = "Ivar ten Cate"
music = "West.music"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 20:53:59
|
Revision: 7892
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7892&view=rev
Author: auria
Date: 2011-03-14 20:53:50 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
No particles during rescue
Modified Paths:
--------------
main/trunk/src/karts/emergency_animation.hpp
main/trunk/src/karts/kart.cpp
Modified: main/trunk/src/karts/emergency_animation.hpp
===================================================================
--- main/trunk/src/karts/emergency_animation.hpp 2011-03-14 20:45:01 UTC (rev 7891)
+++ main/trunk/src/karts/emergency_animation.hpp 2011-03-14 20:53:50 UTC (rev 7892)
@@ -40,7 +40,7 @@
*/
class EmergencyAnimation: public NoCopy
{
-private:
+protected:
/** The coordinates where the kart was hit originally. */
Vec3 m_xyz;
Modified: main/trunk/src/karts/kart.cpp
===================================================================
--- main/trunk/src/karts/kart.cpp 2011-03-14 20:45:01 UTC (rev 7891)
+++ main/trunk/src/karts/kart.cpp 2011-03-14 20:53:50 UTC (rev 7892)
@@ -982,7 +982,7 @@
// on top of a surface (i.e. not falling), actually touching
// something with the wheels, and the material has not the
// below surface property set.
- if(material && isOnGround() && !material->isBelowSurface())
+ if(material && isOnGround() && !material->isBelowSurface() && m_kart_mode != EA_RESCUE)
{
Vec3 xyz;
m_wheel_toggle = 1 - m_wheel_toggle;
@@ -1050,7 +1050,7 @@
}
const ParticleKind *pk =
surface_material->getParticlesWhen(Material::EMIT_ON_DRIVE);
- if(pk && !m_flying)
+ if(pk && !m_flying && m_kart_mode != EA_RESCUE)
{
const float distance = xyz.distance2(from);
m_terrain_particles->setParticleType(pk);
@@ -1076,7 +1076,8 @@
const std::string s = surface_material->getSFXName();
- if (s != "" && (m_terrain_sound == NULL || m_terrain_sound->getStatus() == SFXManager::SFX_STOPPED))
+ if (s != "" && m_kart_mode != EA_RESCUE &&
+ (m_terrain_sound == NULL || m_terrain_sound->getStatus() == SFXManager::SFX_STOPPED))
{
if (m_previous_terrain_sound) sfx_manager->deleteSFX(m_previous_terrain_sound);
m_previous_terrain_sound = m_terrain_sound;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 20:45:07
|
Revision: 7891
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7891&view=rev
Author: auria
Date: 2011-03-14 20:45:01 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Fix pond in lighthouse to splash and rescue
Modified Paths:
--------------
media/trunk/tracks/lighthouse/lighthouse.blend
Modified: media/trunk/tracks/lighthouse/lighthouse.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 20:44:31
|
Revision: 7890
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7890&view=rev
Author: auria
Date: 2011-03-14 20:44:25 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Fix pond in lighthouse to splash and rescue
Modified Paths:
--------------
main/trunk/data/tracks/lighthouse/lighthouse_track.b3d
Modified: main/trunk/data/tracks/lighthouse/lighthouse_track.b3d
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 20:33:52
|
Revision: 7889
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7889&view=rev
Author: auria
Date: 2011-03-14 20:33:46 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Nice water splash in canyon
Modified Paths:
--------------
media/trunk/tracks/canyon/canyon.blend
Added Paths:
-----------
media/trunk/tracks/canyon/textures/seabed.jpg
Modified: media/trunk/tracks/canyon/canyon.blend
===================================================================
(Binary files differ)
Added: media/trunk/tracks/canyon/textures/seabed.jpg
===================================================================
(Binary files differ)
Property changes on: media/trunk/tracks/canyon/textures/seabed.jpg
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/jpeg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 20:33:18
|
Revision: 7888
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7888&view=rev
Author: auria
Date: 2011-03-14 20:33:11 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Nice water splash in canyon
Modified Paths:
--------------
main/trunk/data/tracks/canyon/canyon_track.b3d
main/trunk/data/tracks/canyon/materials.xml
Added Paths:
-----------
main/trunk/data/tracks/canyon/seabed.jpg
Modified: main/trunk/data/tracks/canyon/canyon_track.b3d
===================================================================
(Binary files differ)
Modified: main/trunk/data/tracks/canyon/materials.xml
===================================================================
--- main/trunk/data/tracks/canyon/materials.xml 2011-03-14 20:05:17 UTC (rev 7887)
+++ main/trunk/data/tracks/canyon/materials.xml 2011-03-14 20:33:11 UTC (rev 7888)
@@ -25,5 +25,9 @@
<particles condition="skid drive" base="smoke_brown.xml"/>
</material>
<material name="transparence.png" reset="Y" compositing="test"/>
- <material name="canyon_water.png" reset="Y"/>
+ <material name="seabed.jpg" graphical-effect="water" falling-effect="Y"/>
+ <material name="canyon_water.png" reset="Y" surface="Y">
+ <sfx filename="splash.ogg" name="splash"/>
+ <particles base="splash.xml" condition="skid drive"/>
+ </material>
</materials>
Added: main/trunk/data/tracks/canyon/seabed.jpg
===================================================================
(Binary files differ)
Property changes on: main/trunk/data/tracks/canyon/seabed.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 20:05:23
|
Revision: 7887
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7887&view=rev
Author: auria
Date: 2011-03-14 20:05:17 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Add splash in sand track pond
Modified Paths:
--------------
media/trunk/tracks/sandtrack/sandtrack.blend
Added Paths:
-----------
media/trunk/tracks/sandtrack/seabed.jpg
Modified: media/trunk/tracks/sandtrack/sandtrack.blend
===================================================================
(Binary files differ)
Added: media/trunk/tracks/sandtrack/seabed.jpg
===================================================================
(Binary files differ)
Property changes on: media/trunk/tracks/sandtrack/seabed.jpg
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/jpeg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 20:04:55
|
Revision: 7886
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7886&view=rev
Author: auria
Date: 2011-03-14 20:04:49 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Add splash in sand track pond
Modified Paths:
--------------
main/trunk/data/tracks/sandtrack/graph.xml
main/trunk/data/tracks/sandtrack/materials.xml
main/trunk/data/tracks/sandtrack/quads.xml
main/trunk/data/tracks/sandtrack/sandtrack_track.b3d
main/trunk/data/tracks/sandtrack/scene.xml
main/trunk/data/tracks/sandtrack/track.xml
Added Paths:
-----------
main/trunk/data/tracks/sandtrack/seabed.jpg
main/trunk/data/tracks/sandtrack/water.b3d
Removed Paths:
-------------
main/trunk/data/tracks/sandtrack/mesh.b3d
Modified: main/trunk/data/tracks/sandtrack/graph.xml
===================================================================
--- main/trunk/data/tracks/sandtrack/graph.xml 2011-03-14 16:00:13 UTC (rev 7885)
+++ main/trunk/data/tracks/sandtrack/graph.xml 2011-03-14 20:04:49 UTC (rev 7886)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7092 -->
+<!-- Generated with script from SVN rev 7732 -->
<graph>
<!-- First define all nodes of the graph, and what quads they represent -->
<node-list from-quad="0" to-quad="34"/> <!-- map each quad to a node -->
Modified: main/trunk/data/tracks/sandtrack/materials.xml
===================================================================
--- main/trunk/data/tracks/sandtrack/materials.xml 2011-03-14 16:00:13 UTC (rev 7885)
+++ main/trunk/data/tracks/sandtrack/materials.xml 2011-03-14 20:04:49 UTC (rev 7886)
@@ -1,11 +1,15 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7092 -->
+<!-- Generated with script from SVN rev 7732 -->
<materials>
<material name="clouds.png" light="N"/>
- <material name="egyptsky1.png" transparency="Y" light="N"/>
- <material name="egyptsky2.png" transparency="Y" light="N"/>
-
- <material name="yellow_dirt.jpg" anisotropic="Y">
- <particles base="smoke_yellow.xml" condition="skid" />
+ <material name="egyptsky1.png" transparency="yes" light="N" compositing="test"/>
+ <material name="egyptsky2.png" transparency="yes" light="N" compositing="test"/>
+ <material name="seabed.jpg" graphical-effect="water" falling-effect="Y"/>
+ <material name="water_light.png" surface="Y">
+ <sfx filename="splash.ogg" name="splash"/>
+ <particles condition="skid drive" base="splash.xml"/>
</material>
+ <material name="yellow_dirt.jpg" anisotropic="Y" slowdown-time="1.0">
+ <particles base="smoke_yellow.xml" condition="skid"/>
+ </material>
</materials>
Deleted: main/trunk/data/tracks/sandtrack/mesh.b3d
===================================================================
(Binary files differ)
Modified: main/trunk/data/tracks/sandtrack/quads.xml
===================================================================
--- main/trunk/data/tracks/sandtrack/quads.xml 2011-03-14 16:00:13 UTC (rev 7885)
+++ main/trunk/data/tracks/sandtrack/quads.xml 2011-03-14 20:04:49 UTC (rev 7886)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7092 -->
+<!-- Generated with script from SVN rev 7732 -->
<quads>
<!-- Driveline: DRV_RIGHT -->
- <quad p0="-15.133682 -2.533798 8.853209" p1="17.333778 -2.170572 8.683620" p2="18.832245 -1.689075 29.540520" p3="-13.971924 -2.082319 30.550003"/>
+ <quad p0="-15.133682 -2.533798 8.853209" p1="17.333778 -2.170572 8.683620" p2="18.832245 -1.689075 29.540520" p3="-13.971924 -2.082319 30.550003"/>
<quad p0="0:3" p1="0:2" p2="20.330719 -1.207580 50.397419" p3="-12.906086 -1.032425 49.724407"/>
<quad p0="1:3" p1="1:2" p2="21.829193 -0.726084 71.254318" p3="-11.840248 0.017469 68.898804"/>
<quad p0="2:3" p1="2:2" p2="11.342681 -0.400845 92.109802" p3="-8.268919 -0.024386 89.961426"/>
@@ -33,8 +33,8 @@
<quad p0="27:3" p1="27:2" p2="28.958847 4.481447 -91.185593" p3="-5.387962 5.202726 -96.673477"/>
<quad p0="28:3" p1="28:2" p2="24.706062 3.189388 -69.045609" p3="-10.205406 4.457308 -78.780060"/>
<quad p0="29:3" p1="29:2" p2="20.453278 1.897329 -46.905621" p3="-15.022849 3.711889 -60.886646"/>
- <quad p0="30:3" p1="30:2" p2="18.144295 -0.359910 -29.539450" p3="-15.659145 0.570554 -36.865116"/>
- <quad p0="31:3" p1="31:2" p2="15.835312 -1.458031 -16.231880" p3="-16.295441 -1.280300 -16.902187"/>
- <quad p0="32:3" p1="32:2" p2="16.971720 -1.549646 -4.056080" p3="-15.159033 -2.182478 -4.726387"/>
+ <quad p0="30:3" p1="30:2" p2="18.144295 -0.377370 -29.539450" p3="-15.659145 0.363306 -36.865116"/>
+ <quad p0="31:3" p1="31:2" p2="15.835312 -2.652069 -16.231880" p3="-16.295441 -2.985276 -16.902187"/>
+ <quad p0="32:3" p1="32:2" p2="16.971720 -2.652069 -4.056080" p3="-15.159033 -2.985276 -4.726387"/>
<quad p0="33:3" p1="33:2" p2="0:1" p3="0:0"/>
</quads>
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 2011-03-14 16:00:13 UTC (rev 7885)
+++ main/trunk/data/tracks/sandtrack/scene.xml 2011-03-14 20:04:49 UTC (rev 7886)
@@ -2,7 +2,7 @@
<!-- Generated with script from SVN rev 7732 -->
<scene>
<track model="sandtrack_track.b3d" x="0" y="0" z="0"/>
- <water model="mesh.b3d" xyz="-23.550959 -6.657578 128.668610" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.5" speed="1000" length="0.5"/>
+ <water model="water.b3d" xyz="-23.550959 -6.657578 128.668610" hpr="-0.000000 -0.000000 -0.000000" scale="1.000000 1.000000 1.000000" height="0.2"/>
<banana x="-81.07547" y="1.818746" z="162.129395" />
<banana x="-122.716003" y="3.81994" z="169.308792" />
<banana x="-153.146942" y="4.896215" z="77.678192" />
Added: main/trunk/data/tracks/sandtrack/seabed.jpg
===================================================================
(Binary files differ)
Property changes on: main/trunk/data/tracks/sandtrack/seabed.jpg
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/jpeg
Modified: main/trunk/data/tracks/sandtrack/track.xml
===================================================================
--- main/trunk/data/tracks/sandtrack/track.xml 2011-03-14 16:00:13 UTC (rev 7885)
+++ main/trunk/data/tracks/sandtrack/track.xml 2011-03-14 20:04:49 UTC (rev 7886)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<!-- Generated with script from SVN rev 7092 -->
+<!-- Generated with script from SVN rev 7732 -->
<track name = "Shifting Sands"
- version = "3"
+ version = "5"
groups = "standard"
designer = "Marianne Gagnon"
music = "TheDeadRocks-GreenSecretFromAmazonia.music"
Added: main/trunk/data/tracks/sandtrack/water.b3d
===================================================================
(Binary files differ)
Property changes on: main/trunk/data/tracks/sandtrack/water.b3d
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 16:00:19
|
Revision: 7885
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7885&view=rev
Author: auria
Date: 2011-03-14 16:00:13 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Added forgotten texture
Added Paths:
-----------
main/trunk/data/tracks/jungle/seabed.jpg
Added: main/trunk/data/tracks/jungle/seabed.jpg
===================================================================
(Binary files differ)
Property changes on: main/trunk/data/tracks/jungle/seabed.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 16:00:15
|
Revision: 7884
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7884&view=rev
Author: auria
Date: 2011-03-14 16:00:09 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Real water in garden
Modified Paths:
--------------
media/trunk/tracks/secretgarden/secretgarden.blend
media/trunk/tracks/secretgarden/water_light3.png
Modified: media/trunk/tracks/secretgarden/secretgarden.blend
===================================================================
(Binary files differ)
Modified: media/trunk/tracks/secretgarden/water_light3.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 15:59:34
|
Revision: 7883
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7883&view=rev
Author: auria
Date: 2011-03-14 15:59:27 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Real water in garden
Modified Paths:
--------------
main/trunk/data/tracks/secretgarden/materials.xml
main/trunk/data/tracks/secretgarden/secretgarden_track.b3d
main/trunk/data/tracks/secretgarden/water_light3.png
Modified: main/trunk/data/tracks/secretgarden/materials.xml
===================================================================
--- main/trunk/data/tracks/secretgarden/materials.xml 2011-03-14 02:06:31 UTC (rev 7882)
+++ main/trunk/data/tracks/secretgarden/materials.xml 2011-03-14 15:59:27 UTC (rev 7883)
@@ -24,6 +24,9 @@
<material name="Sophora.png" alpha="yes" compositing="blend"/>
<material name="TiZeta_stalkM.png" ignore="Y"/>
<material name="Trifolium_repens_07_ies.png" transparency="yes" ignore="Y" compositing="test"/>
- <material name="water_light2.png" alpha="yes" ignore="Y" compositing="blend"/>
- <material name="water_light3.png" alpha="yes" reset="Y" graphical-effect="water" compositing="blend"/>
+ <material name="water_light2.png" alpha="yes" ignore="Y" compositing="blend" surface="Y">
+ <sfx filename="splash.ogg" name="splash"/>
+ <particles condition="skid drive" base="splash.xml"/>
+ </material>
+ <material name="water_light3.png" reset="Y" graphical-effect="water" compositing="none" falling-effect="Y"/>
</materials>
Modified: main/trunk/data/tracks/secretgarden/secretgarden_track.b3d
===================================================================
(Binary files differ)
Modified: main/trunk/data/tracks/secretgarden/water_light3.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 02:06:37
|
Revision: 7882
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7882&view=rev
Author: auria
Date: 2011-03-14 02:06:31 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Real waer in jungle (with splash)
Modified Paths:
--------------
media/trunk/tracks/jungle/jungle.blend
Added Paths:
-----------
media/trunk/tracks/jungle/textures/seabed.jpg
Modified: media/trunk/tracks/jungle/jungle.blend
===================================================================
(Binary files differ)
Added: media/trunk/tracks/jungle/textures/seabed.jpg
===================================================================
(Binary files differ)
Property changes on: media/trunk/tracks/jungle/textures/seabed.jpg
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/jpeg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 02:05:48
|
Revision: 7881
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7881&view=rev
Author: auria
Date: 2011-03-14 02:05:42 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Real water in jungle (with splash)
Modified Paths:
--------------
main/trunk/data/tracks/jungle/jungle_track.b3d
main/trunk/data/tracks/jungle/materials.xml
main/trunk/data/tracks/jungle/track.xml
Modified: main/trunk/data/tracks/jungle/jungle_track.b3d
===================================================================
(Binary files differ)
Modified: main/trunk/data/tracks/jungle/materials.xml
===================================================================
--- main/trunk/data/tracks/jungle/materials.xml 2011-03-14 01:49:28 UTC (rev 7880)
+++ main/trunk/data/tracks/jungle/materials.xml 2011-03-14 02:05:42 UTC (rev 7881)
@@ -29,8 +29,12 @@
<particles base="smoke_brown.xml" condition="skid"/>
</material>
<material name="sand2.jpg" anisotropic="Y" backface-culling="Y" clampU="N" clampV="N" compositing="none" disable-z-write="N" friction="1.0" graphical-effect="none" ignore="N" light="Y" max-speed="1.0" reset="N" slowdown-time="1.0" sphere="N" surface="N" below-surface="N" falling-effect="N"/>
+ <material name="seabed.jpg" graphical-effect="water" falling-effect="Y" reset="Y"/>
<material name="statue.JPG" anisotropic="Y" backface-culling="Y" clampU="N" clampV="N" compositing="none" disable-z-write="N" friction="1.0" graphical-effect="none" ignore="N" light="Y" max-speed="1.0" reset="N" slowdown-time="1.0" sphere="N" surface="N" below-surface="N" falling-effect="N"/>
<material name="transparence.png" compositing="test" disable-z-write="Y" reset="Y"/>
- <material name="water_light.png" anisotropic="Y" backface-culling="Y" clampU="N" clampV="N" compositing="none" disable-z-write="N" friction="1.0" graphical-effect="none" ignore="N" light="Y" max-speed="1.0" reset="N" slowdown-time="1.0" sphere="N" surface="N" below-surface="N" falling-effect="N"/>
+ <material name="water_light.png" anisotropic="Y" backface-culling="Y" clampU="N" clampV="N" compositing="none" disable-z-write="N" friction="1.0" graphical-effect="none" ignore="Y" light="Y" max-speed="1.0" reset="N" slowdown-time="1.0" sphere="N" surface="Y" below-surface="N" falling-effect="N">
+ <sfx filename="splash.ogg" name="splash" rolloff="0.10000000149" min-speed="0.0" max-speed="30.0" min-pitch="1.0" max-pitch="1.0" positional="N"/>
+ <particles base="splash.xml" condition="skid drive"/>
+ </material>
<material name="wood.png" anisotropic="Y" backface-culling="Y" clampU="N" clampV="N" compositing="none" disable-z-write="N" friction="1.0" graphical-effect="none" ignore="N" light="Y" max-speed="1.0" reset="N" slowdown-time="1.0" sphere="N" surface="N" below-surface="N" falling-effect="N"/>
</materials>
Modified: main/trunk/data/tracks/jungle/track.xml
===================================================================
--- main/trunk/data/tracks/jungle/track.xml 2011-03-14 01:49:28 UTC (rev 7880)
+++ main/trunk/data/tracks/jungle/track.xml 2011-03-14 02:05:42 UTC (rev 7881)
@@ -3,7 +3,7 @@
<track name = "Amazonian Journey"
version = "5"
groups = "standard"
- designer = "M. Gagnon"
+ designer = "Marianne Gagnon"
music = "amazon_jungle.music"
screenshot = "sshot-jungle.jpg"
>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 01:49:34
|
Revision: 7880
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7880&view=rev
Author: auria
Date: 2011-03-14 01:49:28 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Update lighthouse water with splash sound
Modified Paths:
--------------
media/trunk/tracks/lighthouse/lighthouse.blend
Modified: media/trunk/tracks/lighthouse/lighthouse.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 01:26:13
|
Revision: 7879
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7879&view=rev
Author: auria
Date: 2011-03-14 01:26:07 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Emit a splash sound when hitting water
Modified Paths:
--------------
main/trunk/data/sfx/License.txt
main/trunk/data/sfx/sfx.xml
main/trunk/data/tracks/lighthouse/materials.xml
main/trunk/src/karts/kart.cpp
Added Paths:
-----------
main/trunk/data/sfx/splash.ogg
Modified: main/trunk/data/sfx/License.txt
===================================================================
--- main/trunk/data/sfx/License.txt 2011-03-14 00:45:47 UTC (rev 7878)
+++ main/trunk/data/sfx/License.txt 2011-03-14 01:26:07 UTC (rev 7879)
@@ -85,6 +85,11 @@
Released under Creative Commons Attribution - Share Alike License 3.0
by Atheal Washington and Stephen Dunn (stevo14)
+* splash
+ Based on 'Fish Splashing-SoundBible.com-250179430' sound bible, by blastwavefx.com, released under CC-BY-SA 3.0
+ and on 'Water vaporizing on hot Stones' by Natalie from pdsounds.org, released under public domain
+ Mix by Marianne Gagnon, released under CC-BY-SA 3.0
+
* start_race
obtained from : http://www.freesoundfiles.tintagel.net/Audio/
(see license text below)
Modified: main/trunk/data/sfx/sfx.xml
===================================================================
--- main/trunk/data/sfx/sfx.xml 2011-03-14 00:45:47 UTC (rev 7878)
+++ main/trunk/data/sfx/sfx.xml 2011-03-14 01:26:07 UTC (rev 7879)
@@ -31,6 +31,7 @@
<sfx name="prestart" filename="pre_start_race.ogg" volume="1.0" rolloff="0.1" positional="false" />
<sfx name="start" filename="start_race.ogg" volume="1.0" rolloff="0.1" positional="false" />
<sfx name="track_intro" filename="track_intro.ogg" volume="1.0" rolloff="0.1" positional="false" />
+ <sfx name="splash" filename="splash.ogg" volume="1.0" rolloff="0.05" positional="true" />
<sfx name="swap" filename="swap.ogg" volume="1.0" rolloff="0.05" positional="true" />
<sfx name="ugh" filename="ugh.ogg" volume="1.0" rolloff="0.1" positional="false" />
<sfx name="use_anvil" filename="anvil.ogg" volume="1.0" rolloff="0.5" positional="true" />
Added: main/trunk/data/sfx/splash.ogg
===================================================================
(Binary files differ)
Property changes on: main/trunk/data/sfx/splash.ogg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: main/trunk/data/tracks/lighthouse/materials.xml
===================================================================
--- main/trunk/data/tracks/lighthouse/materials.xml 2011-03-14 00:45:47 UTC (rev 7878)
+++ main/trunk/data/tracks/lighthouse/materials.xml 2011-03-14 01:26:07 UTC (rev 7879)
@@ -16,6 +16,7 @@
<particles base="smoke_yellow.xml" condition="skid drive"/>
</material>
<material name="sea.jpg" ignore="Y" surface="Y">
+ <sfx filename="splash.ogg" name="splash"/>
<particles base="splash.xml" condition="skid drive"/>
</material>
<material name="seabed.jpg" graphical-effect="water" reset="Y" falling-effect="Y"/>
Modified: main/trunk/src/karts/kart.cpp
===================================================================
--- main/trunk/src/karts/kart.cpp 2011-03-14 00:45:47 UTC (rev 7878)
+++ main/trunk/src/karts/kart.cpp 2011-03-14 01:26:07 UTC (rev 7879)
@@ -1073,6 +1073,22 @@
create = 0.0f;
}
m_terrain_particles->setCreationRate(create);
+
+
+ const std::string s = surface_material->getSFXName();
+ if (s != "" && (m_terrain_sound == NULL || m_terrain_sound->getStatus() == SFXManager::SFX_STOPPED))
+ {
+ if (m_previous_terrain_sound) sfx_manager->deleteSFX(m_previous_terrain_sound);
+ m_previous_terrain_sound = m_terrain_sound;
+ if(m_previous_terrain_sound)
+ m_previous_terrain_sound->setLoop(false);
+
+ m_terrain_sound = sfx_manager->createSoundSource(s);
+ m_terrain_sound->play();
+ m_terrain_sound->setLoop(false);
+ }
+
+ // handleMaterialSFX(surface_material);
}
//if (m_camera != NULL) m_camera->setFallMode(true);
//m_camera->setFallMode(false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 00:45:53
|
Revision: 7878
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7878&view=rev
Author: auria
Date: 2011-03-14 00:45:47 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Add getter for fog in Track; it's not used atm but surely it can come in useful... (I added it when investigating bug 8)
Modified Paths:
--------------
main/trunk/src/tracks/track.hpp
Modified: main/trunk/src/tracks/track.hpp
===================================================================
--- main/trunk/src/tracks/track.hpp 2011-03-14 00:17:59 UTC (rev 7877)
+++ main/trunk/src/tracks/track.hpp 2011-03-14 00:45:47 UTC (rev 7878)
@@ -317,6 +317,8 @@
WeatherType getWeatherType () const { return m_weather_type; }
ParticleKind* getSkyParticles () { return m_sky_particles; }
+ bool isFogEnabled() const { return m_use_fog; }
+
std::vector< std::vector<float> > buildHeightMap();
}; // class Track
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 00:18:05
|
Revision: 7877
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7877&view=rev
Author: auria
Date: 2011-03-14 00:17:59 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Make canyon water move (waves + texture dy)
Modified Paths:
--------------
media/trunk/tracks/canyon/canyon.blend
Modified: media/trunk/tracks/canyon/canyon.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <auria@us...> - 2011-03-14 00:17:56
|
Revision: 7876
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7876&view=rev
Author: auria
Date: 2011-03-14 00:17:46 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Make canyon water move (waves + texture dy)
Modified Paths:
--------------
main/trunk/data/tracks/canyon/canyon_track.b3d
main/trunk/data/tracks/canyon/scene.xml
Added Paths:
-----------
main/trunk/data/tracks/canyon/water.b3d
Modified: main/trunk/data/tracks/canyon/canyon_track.b3d
===================================================================
(Binary files differ)
Modified: main/trunk/data/tracks/canyon/scene.xml
===================================================================
--- main/trunk/data/tracks/canyon/scene.xml 2011-03-14 00:00:34 UTC (rev 7875)
+++ main/trunk/data/tracks/canyon/scene.xml 2011-03-14 00:17:46 UTC (rev 7876)
@@ -65,8 +65,10 @@
<static-object model="stone.b3d" xyz="8.500000 0.000000 -20.599998" hpr="-0.000000 35.000003 -0.000000" scale="1.400000 1.000000 1.000000"/>
<static-object model="stone.b3d" xyz="12.000000 0.000000 -39.000000" hpr="-0.000000 -0.000000 -0.000000" scale="1.400000 1.000000 1.000000"/>
<animated-texture name="canyon_conveyor_belt.png" dy="2.0" />
+ </track>
+ <water model="water.b3d" xyz="200.000000 0.000000 100.000000" hpr="-0.000000 -0.000000 0.000000" scale="1.000000 1.000000 1.000000" height="0.9">
<animated-texture name="canyon_water.png" dy="0.1" />
- </track>
+ </water>
<sun xyz="200.0 400.0 800.0"/>
<banana x="274" y="10" z="316" />
<banana x="202" y="10" z="29" />
Added: main/trunk/data/tracks/canyon/water.b3d
===================================================================
(Binary files differ)
Property changes on: main/trunk/data/tracks/canyon/water.b3d
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|