[Supertuxkart-commit] SF.net SVN: supertuxkart:[6043] main/trunk/data

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 6043
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=6043&view=rev
Author:   auria
Date:     2010-09-18 20:01:41 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
Fixed more textures with invalid licenses in garden track

Modified Paths:
--------------
    main/trunk/data/textures/License.txt
    main/trunk/data/tracks/islandtrack/License.txt
    main/trunk/data/tracks/secretgarden/Bleech.png
    main/trunk/data/tracks/secretgarden/Greenhouse-Palm-jubaea01.png
    main/trunk/data/tracks/secretgarden/License.txt
    main/trunk/data/tracks/secretgarden/Palm-arecaceae.png
    main/trunk/data/tracks/secretgarden/graph.xml
    main/trunk/data/tracks/secretgarden/quads.xml
    main/trunk/data/tracks/secretgarden/scene.xml
    main/trunk/data/tracks/secretgarden/secretgarden.track_track.b3d
    main/trunk/data/tracks/secretgarden/track.xml

Added Paths:
-----------
    main/trunk/data/textures/sky2.jpg

Removed Paths:
-------------
    main/trunk/data/tracks/islandtrack/sky2.jpg
    main/trunk/data/tracks/secretgarden/Sky_horiz_17.png

Modified: main/trunk/data/textures/License.txt
===================================================================

--- main/trunk/data/textures/License.txt	2010-09-18 18:23:36 UTC (rev 6042)
+++ main/trunk/data/textures/License.txt	2010-09-18 20:01:41 UTC (rev 6043)
@@ -37,7 +37,7 @@
 
 * bowling, plunger, cake, bubblegum, flaring-star, nitro-tank, nitro-metal, chest,
   gift-box, gift-loop, tank-cyan, tank-blue, tank-green, plunger-icon, bubblegum-icon, cake-icon,
-  bowling-icon, tnt-bomb, nitro-particle, smoke, anchor, anchor-icon, sand2, explode
+  bowling-icon, tnt-bomb, nitro-particle, smoke, anchor, anchor-icon, sand2, explode, sky2
     created by MiniBjorn (c) 2008
 
 * plungerface

Copied: main/trunk/data/textures/sky2.jpg (from rev 6040, main/trunk/data/tracks/islandtrack/sky2.jpg)
===================================================================
(Binary files differ)

Modified: main/trunk/data/tracks/islandtrack/License.txt
===================================================================
--- main/trunk/data/tracks/islandtrack/License.txt	2010-09-18 18:23:36 UTC (rev 6042)
+++ main/trunk/data/tracks/islandtrack/License.txt	2010-09-18 20:01:41 UTC (rev 6043)
@@ -1,4 +1,4 @@
-rock*.jpg, road_sand*.jpg, road_sand_side.png, sky2.jpg by MiniBjorn, released under CC-BY-SA 3.0
+rock*.jpg, road_sand*.jpg, road_sand_side.png MiniBjorn, released under CC-BY-SA 3.0
 
 islandtrack_signs.ac, turn_sharp_24med.png by Pixel (Wayne Dennis), released under Creative Commons Attribution - Share Alike 3.0
 (This has been combined with the track model)

Deleted: main/trunk/data/tracks/islandtrack/sky2.jpg
===================================================================
(Binary files differ)

Modified: main/trunk/data/tracks/secretgarden/Bleech.png
===================================================================
(Binary files differ)

Modified: main/trunk/data/tracks/secretgarden/Greenhouse-Palm-jubaea01.png
===================================================================
(Binary files differ)

Modified: main/trunk/data/tracks/secretgarden/License.txt
===================================================================
--- main/trunk/data/tracks/secretgarden/License.txt	2010-09-18 18:23:36 UTC (rev 6042)
+++ main/trunk/data/tracks/secretgarden/License.txt	2010-09-18 20:01:41 UTC (rev 6043)
@@ -20,8 +20,9 @@
 
 from burningwell (released under public domain) :
 - flower1
+- Bleech
 
-from wikipedia :
+from wikimedia :
 
 -flower2    (http://commons.wikimedia.org/wiki/File:Cosmos_bipinnatus_06_ies.jpg,
              CC-BY-SA 3.0, by Frank Vincentz)
@@ -49,7 +50,15 @@
 
 - TiZeta_barkM (http://commons.wikimedia.org/wiki/File:Apple_box_bark.jpg,
                 CC-BY-SA 3.0, by Benjamint444)
+                
+- Greenhouse-Palm-jubaea01
+    based on image by Forest & Kim Starr, with modifications by Marianne Gagnon
+    Released under CC-BY 3.0
 
+- Palm-arecaceae 
+    based on image by José Reynaldo da Fonseca, with modifications by Marianne Gagnon
+    Released under CC-BY-SA 3
+
 from http://www.marcchehab.org/frozenmist/index.php under CC Attribution 2.0
 some with modifications by Canis Lupus
 
@@ -60,10 +69,7 @@
 from http://blender-archi.tuxfamily.org/Textures 
 
 -Rose                      CC-BY 2.5
--Greenhouse-Palm-jubaea01  CC-BY 2.5
 -Mossy_wall                CC-BY 2.5
--Palm-arecaceae            CC-BY 2.5
--Sky_horiz_17              CC-BY-NC-SA 2.5
 -Sophora                   GPL
 -Toptree-palm03            CC-BY 2.5
 

Modified: main/trunk/data/tracks/secretgarden/Palm-arecaceae.png
===================================================================
(Binary files differ)

Deleted: main/trunk/data/tracks/secretgarden/Sky_horiz_17.png
===================================================================
(Binary files differ)

Modified: main/trunk/data/tracks/secretgarden/graph.xml
===================================================================
--- main/trunk/data/tracks/secretgarden/graph.xml	2010-09-18 18:23:36 UTC (rev 6042)
+++ main/trunk/data/tracks/secretgarden/graph.xml	2010-09-18 20:01:41 UTC (rev 6043)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Generated with script from SVN rev 5794 -->
+<!-- Generated with script from SVN rev 5842 -->
 <graph>
   <!-- First define all nodes of the graph, and what quads they represent -->
   <node-list from-quad="0" to-quad="96"/>  <!-- map each quad to a node  -->

Modified: main/trunk/data/tracks/secretgarden/quads.xml
===================================================================
--- main/trunk/data/tracks/secretgarden/quads.xml	2010-09-18 18:23:36 UTC (rev 6042)
+++ main/trunk/data/tracks/secretgarden/quads.xml	2010-09-18 20:01:41 UTC (rev 6043)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Generated with script from SVN rev 5794 -->
+<!-- Generated with script from SVN rev 5842 -->
 <quads>
   <!-- Driveline: DRV_RIGHT -->
   <quad p0="-3.919449 -3.201596 8.968756" p1="8.027908 -3.201597 14.726446" p2="0.317184 -2.889411 26.455954" p3="-7.504868 -3.201597 16.635710"/>

Modified: main/trunk/data/tracks/secretgarden/scene.xml
===================================================================
--- main/trunk/data/tracks/secretgarden/scene.xml	2010-09-18 18:23:36 UTC (rev 6042)
+++ main/trunk/data/tracks/secretgarden/scene.xml	2010-09-18 20:01:41 UTC (rev 6043)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Generated with script from SVN rev 5794 -->
+<!-- Generated with script from SVN rev 5842 -->
 <scene>
   <track model="secretgarden.track_track.b3d" x="0" y="0" z="0"/>
   <banana x="-145.292831" y="42.518929" z="40.993797" h="60.991425" />
@@ -37,4 +37,9 @@
     <check-line kind="activate" other-id="0" p1="-175.719803 -66.073715" p2="-195.542404 -78.774956"
                 min-height="-1.280505"/>
   </checks>
+
+  <sky-dome texture="sky2.jpg"
+            horizontal="16" vertical="16" 
+            texture-percent="0.5" sphere-percent="1.3"
+            speed-x="0" speed-y="0" />
 </scene>

Modified: main/trunk/data/tracks/secretgarden/secretgarden.track_track.b3d
===================================================================
(Binary files differ)

Modified: main/trunk/data/tracks/secretgarden/track.xml
===================================================================
--- main/trunk/data/tracks/secretgarden/track.xml	2010-09-18 18:23:36 UTC (rev 6042)
+++ main/trunk/data/tracks/secretgarden/track.xml	2010-09-18 20:01:41 UTC (rev 6043)
@@ -1,4 +1,4 @@
-<!-- Generated with script from SVN rev 5037 -->
+<!-- Generated with script from SVN rev 5842 -->
 <?xml version="1.0"?>
 <track  name        = "Secret Garden"
         version     = "2"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


