[Supertuxkart-commit] SF.net SVN: supertuxkart:[12425] main/branches/bubblegum/trunk

[<joh...@us...>]

Revision: 12425
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=12425&view=rev
Author:   johannesr1
Date:     2013-01-26 16:15:46 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
Updating the shield icon and the associated license file.

Modified Paths:
--------------
    main/branches/bubblegum/trunk/data/models/License.txt
    main/branches/bubblegum/trunk/data/models/shield-icon.png
    main/branches/bubblegum/trunk/src/items/attachment_manager.cpp

Modified: main/branches/bubblegum/trunk/data/models/License.txt
===================================================================
--- main/branches/bubblegum/trunk/data/models/License.txt	2013-01-26 13:02:42 UTC (rev 12424)
+++ main/branches/bubblegum/trunk/data/models/License.txt	2013-01-26 16:15:46 UTC (rev 12425)
@@ -74,5 +74,8 @@
 
 * rubber_ball-icon
     by Totoplus62, released under CC-BY-SA 3.0
+
+* shield-icon
+   by tuxfan, release under CC-BY-SA 3.0
     
 Others are GPL, by the original (super)TuxKart team

Modified: main/branches/bubblegum/trunk/data/models/shield-icon.png
===================================================================
(Binary files differ)

Modified: main/branches/bubblegum/trunk/src/items/attachment_manager.cpp
===================================================================
--- main/branches/bubblegum/trunk/src/items/attachment_manager.cpp	2013-01-26 13:02:42 UTC (rev 12424)
+++ main/branches/bubblegum/trunk/src/items/attachment_manager.cpp	2013-01-26 16:15:46 UTC (rev 12425)
@@ -53,7 +53,7 @@
     {Attachment::ATTACH_SWATTER,          "swatter.b3d",      "swatter-icon.png"             },
     {Attachment::ATTACH_NOLOKS_SWATTER,   "swatter_nolok.b3d","swatter-icon.png"             },
     {Attachment::ATTACH_TINYTUX,          "reset-button.b3d", "reset-attach-icon.png"        },
-    {Attachment::ATTACH_BUBBLE_GUM_SHIELD,"reset-button.b3d", "shield-icon.png"}, //TODO: create icon & 3d model ; "bubble-shield-attach-icon.png
+    {Attachment::ATTACH_BUBBLE_GUM_SHIELD,"reset-button.b3d", "shield-icon.png"}, //TODO: make icon work and create 3d model ; "bubble-shield-attach-icon.png
     {Attachment::ATTACH_MAX,              "",                 ""                             },
 };
 

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