[Orxonox-commit 2546] r7251 - in data/branches/png2: . materials/scripts materials/textures

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-08-29 13:42:14 +0200 (Sun, 29 Aug 2010)
New Revision: 7251

Added:
   data/branches/png2/materials/textures/PlasmaBlau.png
   data/branches/png2/materials/textures/glass01.png
   data/branches/png2/materials/textures/glass02.png
   data/branches/png2/materials/textures/plasmaSilver_Tube.png
Removed:
   data/branches/png2/materials/textures/PlasmaBlau.jpg
   data/branches/png2/materials/textures/glass01.jpg
   data/branches/png2/materials/textures/glass02.jpg
   data/branches/png2/materials/textures/plasmaSilver_Tube.jpg
   data/branches/png2/materials/textures/plasmaSilver_Tube.tga
Modified:
   data/branches/png2/AUTHORS
   data/branches/png2/materials/scripts/Carrier.material
   data/branches/png2/materials/scripts/HXY.material
   data/branches/png2/materials/scripts/Transporter.material
Log:
Converted 4 JPG images to PNG.

Modified: data/branches/png2/AUTHORS
===================================================================
--- data/branches/png2/AUTHORS	2010-08-29 10:22:48 UTC (rev 7250)
+++ data/branches/png2/AUTHORS	2010-08-29 11:42:14 UTC (rev 7251)
@@ -328,8 +328,8 @@
 materials/textures/flaretrail.tga                           unknown
 materials/textures/Formation.png                            Benjamin de Capitani
 materials/textures/ghost_complete-texture_Cube.jpg          David Gassner
-materials/textures/glass01.jpg                              Felix Schulthess?
-materials/textures/glass02.jpg                              Felix Schulthess?
+materials/textures/glass01.png                              Felix Schulthess?
+materials/textures/glass02.png                              Felix Schulthess?
 materials/textures/GLX_icon.png                             Felix Schulthess?
 materials/textures/GLX_icon.tga                             Felix Schulthess?
 materials/textures/goldwrenchpickup.jpg                     Benjamin Knecht?
@@ -370,10 +370,9 @@
 materials/textures/pirate.jpg                               Felix Schulthess
 materials/textures/planet.jpg                               Felix Schulthess
 materials/textures/PlasmaAufh_Aufh.jpg                      Benjamin de Capitani
-materials/textures/PlasmaBlau.jpg                           Benjamin de Capitani
+materials/textures/PlasmaBlau.png                           Benjamin de Capitani
 materials/textures/plasmagunParabol_Cylinder002.jpg         Benjamin de Capitani
-materials/textures/plasmaSilverTube.jpg                     Benjamin de Capitani
-materials/textures/plasmaSilverTube.tga                     Benjamin de Capitani
+materials/textures/plasmaSilver_Tube.png                    Benjamin de Capitani
 materials/textures/PSO1024.jpg                              Benjamin de Capitani
 materials/textures/RadarDot.tga                             Fabian Landau
 materials/textures/RadarSquare.tga                          Reto Grieder

Modified: data/branches/png2/materials/scripts/Carrier.material
===================================================================
--- data/branches/png2/materials/scripts/Carrier.material	2010-08-29 10:22:48 UTC (rev 7250)
+++ data/branches/png2/materials/scripts/Carrier.material	2010-08-29 11:42:14 UTC (rev 7251)
@@ -64,7 +64,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture glass01.jpg
+				texture glass01.png
 				tex_address_mode wrap
 				filtering trilinear
 				colour_op modulate

Modified: data/branches/png2/materials/scripts/HXY.material
===================================================================
--- data/branches/png2/materials/scripts/HXY.material	2010-08-29 10:22:48 UTC (rev 7250)
+++ data/branches/png2/materials/scripts/HXY.material	2010-08-29 11:42:14 UTC (rev 7251)
@@ -39,7 +39,7 @@
 			depth_write off
 			texture_unit
 			{
-				texture PlasmaBlau.jpg
+				texture PlasmaBlau.png
 				tex_address_mode wrap
 				filtering trilinear
 				colour_op modulate
@@ -96,7 +96,7 @@
 			depth_write off
 			texture_unit
 			{
-				texture PlasmaBlau.jpg
+				texture PlasmaBlau.png
 				tex_address_mode wrap
 				filtering trilinear
 				colour_op modulate
@@ -362,7 +362,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture plasmaSilver_Tube.tga
+				texture plasmaSilver_Tube.png
 				tex_address_mode wrap
 				filtering trilinear
 				colour_op alpha_blend

Modified: data/branches/png2/materials/scripts/Transporter.material
===================================================================
--- data/branches/png2/materials/scripts/Transporter.material	2010-08-29 10:22:48 UTC (rev 7250)
+++ data/branches/png2/materials/scripts/Transporter.material	2010-08-29 11:42:14 UTC (rev 7251)
@@ -114,7 +114,7 @@
 			depth_write off
 			texture_unit
 			{
-				texture PlasmaBlau.jpg
+				texture PlasmaBlau.png
 				tex_address_mode wrap
 				filtering trilinear
 				colour_op modulate
@@ -143,7 +143,7 @@
 			emissive 0.000000 0.000000 0.000000 1.000000
 			texture_unit
 			{
-				texture plasmaSilver_Tube.tga
+				texture plasmaSilver_Tube.png
 				tex_address_mode wrap
 				filtering trilinear
 				colour_op alpha_blend
@@ -240,7 +240,7 @@
 			depth_write off
 			texture_unit
 			{
-				texture PlasmaBlau.jpg
+				texture PlasmaBlau.png
 				tex_address_mode wrap
 				filtering trilinear
 				colour_op modulate

Deleted: data/branches/png2/materials/textures/PlasmaBlau.jpg
===================================================================
(Binary files differ)

Copied: data/branches/png2/materials/textures/PlasmaBlau.png (from rev 7250, data/branches/png2/materials/textures/PlasmaBlau.jpg)
===================================================================
(Binary files differ)

Deleted: data/branches/png2/materials/textures/glass01.jpg
===================================================================
(Binary files differ)

Copied: data/branches/png2/materials/textures/glass01.png (from rev 7250, data/branches/png2/materials/textures/glass01.jpg)
===================================================================
(Binary files differ)

Deleted: data/branches/png2/materials/textures/glass02.jpg
===================================================================
(Binary files differ)

Copied: data/branches/png2/materials/textures/glass02.png (from rev 7250, data/branches/png2/materials/textures/glass02.jpg)
===================================================================
(Binary files differ)

Deleted: data/branches/png2/materials/textures/plasmaSilver_Tube.jpg
===================================================================
(Binary files differ)

Copied: data/branches/png2/materials/textures/plasmaSilver_Tube.png (from rev 7250, data/branches/png2/materials/textures/plasmaSilver_Tube.jpg)
===================================================================
(Binary files differ)

Deleted: data/branches/png2/materials/textures/plasmaSilver_Tube.tga
===================================================================
(Binary files differ)