[Orxonox-commit 2554] r7259 - in data/branches/png2: . gui/imagesets materials/scripts
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Aug 29 18:40:57 CEST 2010
Author: rgrieder
Date: 2010-08-29 18:40:57 +0200 (Sun, 29 Aug 2010)
New Revision: 7259
Modified:
data/branches/png2/AUTHORS
data/branches/png2/gui/imagesets/FairChar.imageset
data/branches/png2/gui/imagesets/PickupInventory.imageset
data/branches/png2/gui/imagesets/ReadMe.txt
data/branches/png2/gui/imagesets/TaharezGreenLook.imageset
data/branches/png2/gui/imagesets/TaharezLook.imageset
data/branches/png2/gui/imagesets/Vanilla.imageset
data/branches/png2/gui/imagesets/WindowsLook.imageset
data/branches/png2/materials/scripts/3arrowsup.material
data/branches/png2/materials/scripts/Arrow.material
data/branches/png2/materials/scripts/Asterix.material
data/branches/png2/materials/scripts/Bump_Specular.material
data/branches/png2/materials/scripts/Cone.material
data/branches/png2/materials/scripts/Console.material
data/branches/png2/materials/scripts/Cross.material
data/branches/png2/materials/scripts/Example.material
data/branches/png2/materials/scripts/Eye.material
data/branches/png2/materials/scripts/Flares.material
data/branches/png2/materials/scripts/Glass.material
data/branches/png2/materials/scripts/LightningGun-s.material
data/branches/png2/materials/scripts/LightningGun.material
data/branches/png2/materials/scripts/Map.material
data/branches/png2/materials/scripts/Ogre.material
data/branches/png2/materials/scripts/OldMovie.material
data/branches/png2/materials/scripts/Orxonox.material
data/branches/png2/materials/scripts/OrxonoxSky.material
data/branches/png2/materials/scripts/PE_materials.material
data/branches/png2/materials/scripts/Scene.material
data/branches/png2/materials/scripts/Shield.material
data/branches/png2/materials/scripts/Sphere2.material
data/branches/png2/materials/scripts/Stats.material
data/branches/png2/materials/scripts/Test.material
data/branches/png2/materials/scripts/Trail.material
data/branches/png2/materials/scripts/assf.material
data/branches/png2/materials/scripts/assf5.material
data/branches/png2/materials/scripts/asteroid_ice.material
data/branches/png2/materials/scripts/asteroids.material
data/branches/png2/materials/scripts/can.material
data/branches/png2/materials/scripts/crate.material
data/branches/png2/materials/scripts/cube.material
data/branches/png2/materials/scripts/drone.material
data/branches/png2/materials/scripts/h2_green.material
data/branches/png2/materials/scripts/hoover.material
data/branches/png2/materials/scripts/hs-w01.material
data/branches/png2/materials/scripts/hs-w01s.material
data/branches/png2/materials/scripts/iceplanet.material
data/branches/png2/materials/scripts/laserbeam.material
data/branches/png2/materials/scripts/planet.material
data/branches/png2/materials/scripts/rock.material
data/branches/png2/materials/scripts/spacecruiser.material
data/branches/png2/materials/scripts/sphere.material
data/branches/png2/materials/scripts/starship.material
data/branches/png2/materials/scripts/swallow_material.material
Log:
Replaced *.tga references with .png references.
Modified: data/branches/png2/AUTHORS
===================================================================
--- data/branches/png2/AUTHORS 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/AUTHORS 2010-08-29 16:40:57 UTC (rev 7259)
@@ -106,21 +106,21 @@
gui/imagesets/DriveIcons.imageset Reto Grieder?
gui/imagesets/DriveIcons.png Reto Grieder?
gui/imagesets/FairChar.imageset Reto Grieder?
-gui/imagesets/FairChar.tga Reto Grieder?
-gui/imagesets/GPN-2000-001437.tga GRIN (http://grin.hq.nasa.gov/)
+gui/imagesets/FairChar.png Reto Grieder?
+gui/imagesets/GPN-2000-001437.png GRIN (http://grin.hq.nasa.gov/)
gui/imagesets/Imageset.xsd Reto Grieder?
gui/imagesets/main_menu_1.jpg Reto Grieder
gui/imagesets/MainMenuBackground.imageset Benjamin Knecht
-gui/imagesets/pickup.tga Damian Frick, Eric Beier and Benedict Simlinger
+gui/imagesets/pickup.png Damian Frick, Eric Beier and Benedict Simlinger
gui/imagesets/PickupInventory.imageset Damian Frick, Eric Beier and Benedict Simlinger
gui/imagesets/sleekspace.imageset Seth Yastrov
gui/imagesets/sleekspace.png Seth Yastrov
gui/imagesets/TaharezLook.imageset Lars "Taharez" Rinde
-gui/imagesets/TaharezLook.tga Lars "Taharez" Rinde
+gui/imagesets/TaharezLook.png Lars "Taharez" Rinde
gui/imagesets/Vanilla.imageset Shane Parker
-gui/imagesets/vanilla.tga Shane Parker
+gui/imagesets/vanilla.png Shane Parker
gui/imagesets/WindowsLook.imageset Paul "CrazyEddie" Turner
-gui/imagesets/WindowsLook.tga Paul "CrazyEddie" Turner
+gui/imagesets/WindowsLook.png Paul "CrazyEddie" Turner
gui/looknfeel/Falagard.xsd unknown
gui/looknfeel/sleekspace.looknfeel Seth Yastrov
gui/looknfeel/TaharezLook.looknfeel Lars "Taharez" Rinde
@@ -213,7 +213,7 @@
materials/scripts/laserbeam.material Hagen Seifert
materials/scripts/LightningGun.material Joël Smely
materials/scripts/LightningGun-s.material Joël Smely
-materials/scripts/LightningGun-s.tga Joël Smely
+materials/scripts/LightningGun-s.png Joël Smely
materials/scripts/Map.material Si Sun
materials/scripts/MotionBlur.compositor Janis Edelmann
materials/scripts/MotionBlur.material Janis Edelmann
@@ -251,55 +251,55 @@
materials/scripts/Transporter.material Benjamin de Capitani
materials/scripts/UEATransporter036.material Axel Bomhauer-Beins
materials/scripts/wrench.material Benjamin Knecht
-materials/textures/3arrowsup.tga Eric Beier and Benedict Simlinger
-materials/textures/arrow.tga Damian Frick
-materials/textures/arrows.tga Felix Schulthess
+materials/textures/3arrowsup.png Eric Beier and Benedict Simlinger
+materials/textures/arrow.png Damian Frick
+materials/textures/arrows.png Felix Schulthess
materials/textures/assff.JPG Felix Schulthess
-materials/textures/asterix.tga Damian Frick
-materials/textures/asteroid.tga Benjamin de Capitani
-materials/textures/asteroid_ice.tga Benjamin de Capitani
+materials/textures/asterix.png Damian Frick
+materials/textures/asteroid.png Benjamin de Capitani
+materials/textures/asteroid_ice.png Benjamin de Capitani
materials/textures/atmosphere.png Felix Schulthess
-materials/textures/atmospheretype1.tga Marian Runo
-materials/textures/atmospheretype2.tga Marian Runo
-materials/textures/atmospheretype3.tga Marian Runo
-materials/textures/atmospheretype4.tga Marian Runo
-materials/textures/atmospheretype5.tga Marian Runo
+materials/textures/atmospheretype1.png Marian Runo
+materials/textures/atmospheretype2.png Marian Runo
+materials/textures/atmospheretype3.png Marian Runo
+materials/textures/atmospheretype4.png Marian Runo
+materials/textures/atmospheretype5.png Marian Runo
materials/textures/babel-base2.jpg Georges Grondin (cc-by-sa)
materials/textures/babel-trim3b.jpg Georges Grondin (cc-by-sa)
materials/textures/babel-wall1a.jpg Georges Grondin (cc-by-sa)
materials/textures/babel-wall1b.jpg Georges Grondin (cc-by-sa)
materials/textures/babel-wall6a.jpg Georges Grondin (cc-by-sa)
materials/textures/babel-wall6b.jpg Georges Grondin (cc-by-sa)
-materials/textures/backGround.tga unknown
-materials/textures/backlightflare.tga Fabian Landau
-materials/textures/backlighttrail.tga Fabian Landau
-materials/textures/backlighttrail2.tga David Gassner
-materials/textures/bar1.tga Felix Schulthess
-materials/textures/bar2a.tga Felix Schulthess
-materials/textures/bar2b.tga Felix Schulthess
-materials/textures/bar2c.tga Felix Schulthess
-materials/textures/bar2.tga Felix Schulthess
-materials/textures/bigflame.tga unknown
-materials/textures/bigflare1.tga Fabian Landau
-materials/textures/can.tga Hagen Seifert
+materials/textures/backGround.png unknown
+materials/textures/backlightflare.png Fabian Landau
+materials/textures/backlighttrail.png Fabian Landau
+materials/textures/backlighttrail2.png David Gassner
+materials/textures/bar1.png Felix Schulthess
+materials/textures/bar2a.png Felix Schulthess
+materials/textures/bar2b.png Felix Schulthess
+materials/textures/bar2c.png Felix Schulthess
+materials/textures/bar2.png Felix Schulthess
+materials/textures/bigflame.png unknown
+materials/textures/bigflare1.png Fabian Landau
+materials/textures/can.png Hagen Seifert
materials/textures/centeroverlay.png Michael Wirth
materials/textures/clouds.png Benjamin de Capitani
materials/textures/CockpitGlass.jpg Mirko Kaiser
materials/textures/CockpitNose.jpg Mirko Kaiser
materials/textures/CockpitSide.png Mirko Kaiser
-materials/textures/console2.tga Felix Schulthess
-materials/textures/console3.tga Felix Schulthess
-materials/textures/console4.tga Felix Schulthess
-materials/textures/console5.tga Reto Grieder
-materials/textures/crate.tga Reto Grieder
-materials/textures/cross.tga Damian Frick
-materials/textures/crosshair.tga unknown
-materials/textures/crosshair2.tga Fabian Landau
+materials/textures/console2.png Felix Schulthess
+materials/textures/console3.png Felix Schulthess
+materials/textures/console4.png Felix Schulthess
+materials/textures/console5.png Reto Grieder
+materials/textures/crate.png Reto Grieder
+materials/textures/cross.png Damian Frick
+materials/textures/crosshair.png unknown
+materials/textures/crosshair2.png Fabian Landau
materials/textures/crosshair3.png Michael Wirth
materials/textures/CuboidConnectionBodySide.jpg Mirko Kaiser
materials/textures/CuboidConnectionBodyTop.jpg Mirko Kaiser
-materials/textures/cursor_console.tga Reto Grieder
-materials/textures/cursor.tga unknown
+materials/textures/cursor_console.png Reto Grieder
+materials/textures/cursor.png unknown
materials/textures/damageoverlaybottom.png Michael Wirth
materials/textures/damageoverlayleft.png Michael Wirth
materials/textures/damageoverlayright.png Michael Wirth
@@ -313,60 +313,59 @@
materials/textures/dirt01.jpg unknown
materials/textures/Dirt.jpg unknown
materials/textures/dish.jpg Felix Schulthess
-materials/textures/drone.tga unknown
+materials/textures/drone.png unknown
materials/textures/Drone.png Benjamin de Capitani
materials/textures/DuBall1.jpg Rocco Bottani, Massimo Maffioli
materials/textures/DuBall2.jpg Rocco Bottani, Massimo Maffioli
-materials/textures/explosion3.tga Fabian Landau
-materials/textures/explosion.tga unknown
-materials/textures/eye.tga Eric Beier and Benedict Simlinger
-materials/textures/final_gold.tga David Gassner
-materials/textures/flare2_1.tga David Gassner
-materials/textures/flare2.tga unknown
-materials/textures/flare.tga Felix Schulthess
-materials/textures/flare3.tga David Gassner
-materials/textures/flaretrail.tga unknown
+materials/textures/explosion3.png Fabian Landau
+materials/textures/explosion.png unknown
+materials/textures/eye.png Eric Beier and Benedict Simlinger
+materials/textures/final_gold.png David Gassner
+materials/textures/flare2_1.png David Gassner
+materials/textures/flare2.png unknown
+materials/textures/flare.png Felix Schulthess
+materials/textures/flare3.png David Gassner
+materials/textures/flaretrail.png unknown
materials/textures/Formation.png Benjamin de Capitani
materials/textures/ghost_complete-texture_Cube.jpg David Gassner
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?
materials/textures/GreenSkin.jpg unknown
-materials/textures/healthbar_bar.tga Fabian Landau
-materials/textures/healthbar_bg.tga Fabian Landau
-materials/textures/hs-w01s.tga Hagen Seifert
-materials/textures/hs-w01.tga Hagen Seifert
+materials/textures/healthbar_bar.png Fabian Landau
+materials/textures/healthbar_bg.png Fabian Landau
+materials/textures/hs-w01s.png Hagen Seifert
+materials/textures/hs-w01.png Hagen Seifert
materials/textures/hs-w01_reduced.png Benjamin de Capitani
-materials/textures/iceplanet.tga Marian Runo
+materials/textures/iceplanet.png Marian Runo
materials/textures/jumpturbinepickup.jpg Benjamin Knecht?
-materials/textures/laserbeam.tga unknown
-materials/textures/LightningBall_1.tga Joël Smely
-materials/textures/LightningBall_2.tga Joël Smely
-materials/textures/LightningBall_3.tga Joël Smely
-materials/textures/LightningBall_4.tga Joël Smely
-materials/textures/LightningBall_5.tga Joël Smely
-materials/textures/LightningBall_6.tga Joël Smely
-materials/textures/LightningBall_7.tga Joël Smely
-materials/textures/LightningBall_8.tga Joël Smely
-materials/textures/Lightning_gun4.tga Joël Smely
-materials/textures/Lightning_gun_pic2.tga Joël Smely
-materials/textures/LightningGun.tga Joël Smely
-materials/textures/mapgrid.tga Si Sun
+materials/textures/laserbeam.png unknown
+materials/textures/LightningBall_1.png Joël Smely
+materials/textures/LightningBall_2.png Joël Smely
+materials/textures/LightningBall_3.png Joël Smely
+materials/textures/LightningBall_4.png Joël Smely
+materials/textures/LightningBall_5.png Joël Smely
+materials/textures/LightningBall_6.png Joël Smely
+materials/textures/LightningBall_7.png Joël Smely
+materials/textures/LightningBall_8.png Joël Smely
+materials/textures/Lightning_gun4.png Joël Smely
+materials/textures/Lightning_gun_pic2.png Joël Smely
+materials/textures/LightningGun.png Joël Smely
+materials/textures/mapgrid.png Si Sun
materials/textures/MetalBare.jpg Benjamin de Capitani
materials/textures/MetalBase0020_thumbhuge.jpg Benjamin de Capitani
materials/textures/MetalBase0030_thumbhuge.jpg Benjamin de Capitani
materials/textures/MetalEdge.jpg Georges Grondin (cc-by-sa)
materials/textures/ogrelogo-small.jpg unknown
-materials/textures/ogrelogo.tga unknown
-materials/textures/OrxonoxBlack.tga unknown
-materials/textures/OrxonoxGREEN.tga Reto Grieder
+materials/textures/ogrelogo.png unknown
+materials/textures/OrxonoxBlack.png unknown
+materials/textures/OrxonoxGREEN.png Reto Grieder
materials/textures/orxonox_logo.svg Benjamin Knecht
-materials/textures/OrxonoxORANGE.tga unknown
-materials/textures/OrxonoxRED.tga unknown
-materials/textures/OrxonoxYELLOW.tga Reto Grieder
-materials/textures/Pickups.tga Benjamin de Capitani
+materials/textures/OrxonoxORANGE.png unknown
+materials/textures/OrxonoxRED.png unknown
+materials/textures/OrxonoxYELLOW.png Reto Grieder
+materials/textures/Pickups.png Benjamin de Capitani
materials/textures/pirate.jpg Felix Schulthess
materials/textures/planet.jpg Felix Schulthess
materials/textures/PlasmaAufh_Aufh.jpg Benjamin de Capitani
@@ -374,20 +373,20 @@
materials/textures/plasmagunParabol_Cylinder002.jpg 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
-materials/textures/radar.tga Felix Schulthess
-materials/textures/RadarTriangle.tga Fabian Landau
-materials/textures/ring_flare2.tga unknown
-materials/textures/ring_flare.tga unknown
-materials/textures/rock.tga unknown
+materials/textures/RadarDot.png Fabian Landau
+materials/textures/RadarSquare.png Reto Grieder
+materials/textures/radar.png Felix Schulthess
+materials/textures/RadarTriangle.png Fabian Landau
+materials/textures/ring_flare2.png unknown
+materials/textures/ring_flare.png unknown
+materials/textures/rock.png unknown
materials/textures/rockettex.jpg Daniel Cristen
-materials/textures/rust.tga Felix Schulthess
+materials/textures/rust.png Felix Schulthess
materials/textures/RustySteel.jpg unknown
materials/textures/sample_loading.jpg unknown
-materials/textures/Sepia1D.tga Fabian Landau?
+materials/textures/Sepia1D.png Fabian Landau?
materials/textures/sewer_001.png Martin Polak?
-materials/textures/shield.tga Eric Beier and Benedict Simlinger
+materials/textures/shield.png Eric Beier and Benedict Simlinger
materials/textures/skypanoramagen1_bk.jpg Fabian Landau?
materials/textures/skypanoramagen1_dn.jpg Fabian Landau?
materials/textures/skypanoramagen1_fr.jpg Fabian Landau?
@@ -420,30 +419,30 @@
materials/textures/sl_organic03.jpg Felix Schulthess
materials/textures/sl_organic04.jpg Felix Schulthess
materials/textures/sl_panel.jpg Felix Schulthess
-materials/textures/smoke2.tga Fabian Landau
-materials/textures/smoke3.tga Fabian Landau
-materials/textures/smoke4.tga Gion-Andri Cantieni
-materials/textures/smokecolors.tga unknown
-materials/textures/smoke.tga Benjamin de Capitani
+materials/textures/smoke2.png Fabian Landau
+materials/textures/smoke3.png Fabian Landau
+materials/textures/smoke4.png Gion-Andri Cantieni
+materials/textures/smokecolors.png unknown
+materials/textures/smoke.png Benjamin de Capitani
materials/textures/snowyWhite.jpg Mirko Kaiser
materials/textures/spacecruiser_16.jpg Felix Schulthess
materials/textures/Spaceshipbody.jpg unknown
materials/textures/SpaceShipTransporter036_engine.jpg Axel Bomhauer-Beins
materials/textures/SpaceShipTransporter036_newtexture.jpg Axel Bomhauer-Beins
materials/textures/SpaceshipWings.jpg Benjamin de Capitani
-materials/textures/spacesruiser.tga unknown
-materials/textures/sphere.tga Damian Frick
+materials/textures/spacesruiser.png unknown
+materials/textures/sphere.png Damian Frick
materials/textures/starbox_bk.jpg Felix Schulthess
materials/textures/starbox_dn.jpg Felix Schulthess
materials/textures/starbox_fr.jpg Felix Schulthess
materials/textures/starbox_lf.jpg Felix Schulthess
materials/textures/starbox_rt.jpg Felix Schulthess
materials/textures/starbox_up.jpg Felix Schulthess
-materials/textures/starship.tga unknown
+materials/textures/starship.png unknown
materials/textures/stockstealth.jpeg Benjamin de Capitani
-materials/textures/streak.tga unknown
-materials/textures/swallow_tex.tga David Gassner
-materials/textures/tdc.tga Felix Schulthess
+materials/textures/streak.png unknown
+materials/textures/swallow_tex.png David Gassner
+materials/textures/tdc.png Felix Schulthess
materials/textures/texture.jpg Benjamin de Capitani
materials/textures/thrust.jpg Felix Schulthess
materials/textures/tiled_floor.jpg Reto Grieder
@@ -451,7 +450,7 @@
materials/textures/transporter5Huelle-Cube.001.jpg Benjamin de Capitani
materials/textures/Triebwerk1_Cylinder.jpg Benjamin de Capitani
materials/textures/wall01.jpg Felix Schulthess
-materials/textures/white.tga Felix Schulthess
+materials/textures/white.png Felix Schulthess
materials/textures/sl_metal/sl_metal_001.png Martin Polak?
materials/textures/sl_metal/sl_metal_002.png Martin Polak?
materials/textures/sl_metal/sl_metal_003.png Martin Polak?
Modified: data/branches/png2/gui/imagesets/FairChar.imageset
===================================================================
--- data/branches/png2/gui/imagesets/FairChar.imageset 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/gui/imagesets/FairChar.imageset 2010-08-29 16:40:57 UTC (rev 7259)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="FairChar" Imagefile="FairChar.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
+<Imageset Name="FairChar" Imagefile="FairChar.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
<Image Name=" " XPos="0" YPos="0" Width="0" Height="0" />
<Image Name="A" XPos="4" YPos="1" Width="30" Height="30" YOffset="-30" />
<Image Name="B" XPos="35" YPos="1" Width="31" Height="30" YOffset="-30" />
Modified: data/branches/png2/gui/imagesets/PickupInventory.imageset
===================================================================
--- data/branches/png2/gui/imagesets/PickupInventory.imageset 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/gui/imagesets/PickupInventory.imageset 2010-08-29 16:40:57 UTC (rev 7259)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="PickupInventory" Imagefile="pickup.tga" NativeHorzRes="1600" NativeVertRes="100" AutoScaled="true">
+<Imageset Name="PickupInventory" Imagefile="pickup.png" NativeHorzRes="1600" NativeVertRes="100" AutoScaled="true">
<Image Name="Default" XPos="0" YPos="0" Width="100" Height="100"/>
<Image Name="SmallHealth" XPos="100" YPos="0" Width="100" Height="100"/>
Modified: data/branches/png2/gui/imagesets/ReadMe.txt
===================================================================
--- data/branches/png2/gui/imagesets/ReadMe.txt 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/gui/imagesets/ReadMe.txt 2010-08-29 16:40:57 UTC (rev 7259)
@@ -1,6 +1,6 @@
The images in this directory were obtained from various sources...
-GPN-2000-001437.tga - From GRIN (http://grin.hq.nasa.gov/)
-TaharezLook.tga - Original Taharez imagery created by Lars "Taharez" Rinde.
-WindowsLook.tga - Windows look imagery created by Paul "CrazyEddie" Turner.
-vanilla.tga - Original "Vanilla GUI" imagery created by Shane Parker, used with permission.
+GPN-2000-001437.png - From GRIN (http://grin.hq.nasa.gov/)
+TaharezLook.png - Original Taharez imagery created by Lars "Taharez" Rinde.
+WindowsLook.png - Windows look imagery created by Paul "CrazyEddie" Turner.
+vanilla.png - Original "Vanilla GUI" imagery created by Shane Parker, used with permission.
Modified: data/branches/png2/gui/imagesets/TaharezGreenLook.imageset
===================================================================
--- data/branches/png2/gui/imagesets/TaharezGreenLook.imageset 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/gui/imagesets/TaharezGreenLook.imageset 2010-08-29 16:40:57 UTC (rev 7259)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="TaharezGreenLook" Imagefile="TaharezGreenLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
+<Imageset Name="TaharezGreenLook" Imagefile="TaharezGreenLook.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
<Image Name="ClientBrush" XPos="2" YPos="2" Width="64" Height="64" />
<Image Name="GenericBrush" XPos="9" YPos="71" Width="1" Height="1" />
<Image Name="WindowLeftEdge" XPos="6" YPos="95" Width="1" Height="22" XOffset="4" />
Modified: data/branches/png2/gui/imagesets/TaharezLook.imageset
===================================================================
--- data/branches/png2/gui/imagesets/TaharezLook.imageset 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/gui/imagesets/TaharezLook.imageset 2010-08-29 16:40:57 UTC (rev 7259)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="TaharezLook" Imagefile="TaharezLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
+<Imageset Name="TaharezLook" Imagefile="TaharezLook.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
<Image Name="ClientBrush" XPos="2" YPos="2" Width="64" Height="64" />
<Image Name="GenericBrush" XPos="9" YPos="71" Width="1" Height="1" />
<Image Name="WindowLeftEdge" XPos="6" YPos="95" Width="1" Height="22" XOffset="4" />
Modified: data/branches/png2/gui/imagesets/Vanilla.imageset
===================================================================
--- data/branches/png2/gui/imagesets/Vanilla.imageset 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/gui/imagesets/Vanilla.imageset 2010-08-29 16:40:57 UTC (rev 7259)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="Vanilla-Images" Imagefile="vanilla.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
+<Imageset Name="Vanilla-Images" Imagefile="vanilla.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
<Image Name="GenericBrush" XPos="46" YPos="46" Width="3" Height="3" />
<Image Name="FrameTopLeft" XPos="1" YPos="1" Width="6" Height="6" />
<Image Name="FrameTopRight" XPos="10" YPos="1" Width="6" Height="6" />
Modified: data/branches/png2/gui/imagesets/WindowsLook.imageset
===================================================================
--- data/branches/png2/gui/imagesets/WindowsLook.imageset 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/gui/imagesets/WindowsLook.imageset 2010-08-29 16:40:57 UTC (rev 7259)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<Imageset Name="WindowsLook" Imagefile="WindowsLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
+<Imageset Name="WindowsLook" Imagefile="WindowsLook.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
<Image Name="Background" XPos="9" YPos="9" Width="2" Height="2" />
<Image Name="WindowFrameLeft" XPos="2" YPos="9" Width="4" Height="2" />
<Image Name="WindowFrameRight" XPos="14" YPos="9" Width="4" Height="2" />
Modified: data/branches/png2/materials/scripts/3arrowsup.material
===================================================================
--- data/branches/png2/materials/scripts/3arrowsup.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/3arrowsup.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture 3arrowsup.tga
+ texture 3arrowsup.png
}
}
}
Modified: data/branches/png2/materials/scripts/Arrow.material
===================================================================
--- data/branches/png2/materials/scripts/Arrow.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Arrow.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture arrow.tga
+ texture arrow.png
}
}
}
Modified: data/branches/png2/materials/scripts/Asterix.material
===================================================================
--- data/branches/png2/materials/scripts/Asterix.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Asterix.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture asterix.tga
+ texture asterix.png
}
}
}
Modified: data/branches/png2/materials/scripts/Bump_Specular.material
===================================================================
--- data/branches/png2/materials/scripts/Bump_Specular.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Bump_Specular.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -64,20 +64,20 @@
// Base bump map
texture_unit
{
- texture nmnone.tga
+ texture nmnone.png
colour_op replace
}
// Normalisation cube map
texture_unit
{
- cubic_texture nm.tga combinedUVW
+ cubic_texture nm.png combinedUVW
tex_coord_set 1
tex_address_mode clamp
}
// Normalisation cube map #2
texture_unit
{
- cubic_texture nm.tga combinedUVW
+ cubic_texture nm.png combinedUVW
tex_coord_set 2
tex_address_mode clamp
}
@@ -153,13 +153,13 @@
// Base bump map
texture_unit
{
- texture nmnone.tga
+ texture nmnone.png
colour_op replace
}
// Normalisation cube map, with dot product on bump map
texture_unit
{
- cubic_texture nm.tga combinedUVW
+ cubic_texture nm.png combinedUVW
tex_coord_set 1
tex_address_mode clamp
colour_op_ex dotproduct src_texture src_current
Modified: data/branches/png2/materials/scripts/Cone.material
===================================================================
--- data/branches/png2/materials/scripts/Cone.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Cone.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture OrxonoxGREEN.tga
+ texture OrxonoxGREEN.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/Console.material
===================================================================
--- data/branches/png2/materials/scripts/Console.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Console.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture console2.tga
+ texture console2.png
}
}
}
@@ -28,7 +28,7 @@
texture_unit
{
- texture console3.tga
+ texture console3.png
}
}
}
@@ -46,7 +46,7 @@
texture_unit
{
- texture console4.tga
+ texture console4.png
}
}
}
@@ -64,7 +64,7 @@
texture_unit
{
- texture console5.tga
+ texture console5.png
}
}
}
@@ -82,7 +82,7 @@
texture_unit
{
- texture OrxonoxWhite.tga
+ texture OrxonoxWhite.png
}
texture_unit
{
Modified: data/branches/png2/materials/scripts/Cross.material
===================================================================
--- data/branches/png2/materials/scripts/Cross.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Cross.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture cross.tga
+ texture cross.png
}
}
}
Modified: data/branches/png2/materials/scripts/Example.material
===================================================================
--- data/branches/png2/materials/scripts/Example.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Example.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -13,7 +13,7 @@
texture_unit
{
- texture spheremap.tga
+ texture spheremap.png
colour_op_ex add src_texture src_current
colour_op_multipass_fallback one one
env_map spherical
@@ -31,7 +31,7 @@
texture_unit
{
- texture ogrelogo.tga
+ texture ogrelogo.png
}
}
}
@@ -335,7 +335,7 @@
texture_unit
{
- texture flare.tga
+ texture flare.png
}
}
}
@@ -352,7 +352,7 @@
texture_unit
{
- texture flare2.tga
+ texture flare2.png
}
}
}
@@ -369,7 +369,7 @@
texture_unit
{
- texture flare3.tga
+ texture flare3.png
}
}
}
@@ -386,7 +386,7 @@
texture_unit
{
- texture flare2_1.tga
+ texture flare2_1.png
}
}
}
@@ -403,7 +403,7 @@
texture_unit
{
- texture flaretrail.tga
+ texture flaretrail.png
}
}
}
@@ -424,7 +424,7 @@
texture_unit
{
- texture flare.tga
+ texture flare.png
}
}
}
@@ -441,7 +441,7 @@
texture_unit
{
- texture basic_droplet.tga
+ texture basic_droplet.png
}
}
}
@@ -455,7 +455,7 @@
texture_unit
{
- texture dkyellow.tga
+ texture dkyellow.png
}
}
}
@@ -484,7 +484,7 @@
texture_unit
{
- texture 10points.tga
+ texture 10points.png
}
}
}
@@ -526,7 +526,7 @@
{
texture_unit
{
- texture steelhead.tga
+ texture steelhead.png
}
}
}
@@ -636,7 +636,7 @@
cull_software none
texture_unit
{
- texture gras_02.tga
+ texture gras_02.png
}
}
}
@@ -652,7 +652,7 @@
cull_software none
texture_unit
{
- texture gras_02.tga
+ texture gras_02.png
}
}
}
@@ -666,7 +666,7 @@
{
texture_unit
{
- texture rockwall.tga
+ texture rockwall.png
}
}
}
@@ -685,7 +685,7 @@
texture_unit
{
- texture aureola.tga PF_BYTE_LA
+ texture aureola.png PF_BYTE_LA
tex_address_mode clamp
}
}
@@ -774,7 +774,7 @@
emissive 0.0 0.0 0.0 1.0
texture_unit
{
- texture RustyBarrel.tga
+ texture RustyBarrel.png
filtering trilinear
}
}
@@ -794,7 +794,7 @@
texture_unit
{
- texture WoodPallet.tga
+ texture WoodPallet.png
filtering trilinear
}
}
@@ -813,7 +813,7 @@
texture_unit
{
- texture ribbonband.tga 1d
+ texture ribbonband.png 1d
tex_address_mode clamp
filtering none
}
Modified: data/branches/png2/materials/scripts/Eye.material
===================================================================
--- data/branches/png2/materials/scripts/Eye.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Eye.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture eye.tga
+ texture eye.png
}
}
}
Modified: data/branches/png2/materials/scripts/Flares.material
===================================================================
--- data/branches/png2/materials/scripts/Flares.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Flares.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -14,7 +14,7 @@
texture_unit
{
- texture flare.tga
+ texture flare.png
}
}
}
@@ -32,7 +32,7 @@
texture_unit
{
- texture flare.tga
+ texture flare.png
}
}
}
@@ -50,7 +50,7 @@
texture_unit
{
- texture ring_flare.tga
+ texture ring_flare.png
}
}
}
@@ -68,7 +68,7 @@
texture_unit
{
- texture ring_flare2.tga
+ texture ring_flare2.png
}
}
}
@@ -86,7 +86,7 @@
texture_unit
{
- texture flaretrail.tga
+ texture flaretrail.png
}
}
}
@@ -104,7 +104,7 @@
texture_unit
{
- texture backlightflare.tga
+ texture backlightflare.png
}
}
}
@@ -122,7 +122,7 @@
texture_unit
{
- texture bigflare1.tga
+ texture bigflare1.png
}
}
}
@@ -140,7 +140,7 @@
texture_unit
{
- texture LightningBall_1.tga
+ texture LightningBall_1.png
}
}
}
@@ -158,7 +158,7 @@
texture_unit
{
- texture LightningBall_2.tga
+ texture LightningBall_2.png
}
}
}
@@ -176,7 +176,7 @@
texture_unit
{
- texture LightningBall_3.tga
+ texture LightningBall_3.png
}
}
}
@@ -194,7 +194,7 @@
texture_unit
{
- texture LightningBall_4.tga
+ texture LightningBall_4.png
}
}
}
@@ -212,7 +212,7 @@
texture_unit
{
- texture LightningBall_5.tga
+ texture LightningBall_5.png
}
}
}
@@ -230,7 +230,7 @@
texture_unit
{
- texture LightningBall_6.tga
+ texture LightningBall_6.png
}
}
}
@@ -248,7 +248,7 @@
texture_unit
{
- texture LightningBall_7.tga
+ texture LightningBall_7.png
}
}
}
@@ -266,7 +266,7 @@
texture_unit
{
- texture LightningBall_8.tga
+ texture LightningBall_8.png
}
}
}
Modified: data/branches/png2/materials/scripts/Glass.material
===================================================================
--- data/branches/png2/materials/scripts/Glass.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Glass.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -30,7 +30,7 @@
texture_unit
{
- texture WaterNormal1.tga 2d
+ texture WaterNormal1.png 2d
tex_coord_set 1
//tex_address_mode clamp
filtering linear linear linear
Modified: data/branches/png2/materials/scripts/LightningGun-s.material
===================================================================
--- data/branches/png2/materials/scripts/LightningGun-s.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/LightningGun-s.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture Lightning_gun4.tga
+ texture Lightning_gun4.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/LightningGun.material
===================================================================
--- data/branches/png2/materials/scripts/LightningGun.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/LightningGun.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture Lightning_gun4.tga
+ texture Lightning_gun4.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/Map.material
===================================================================
--- data/branches/png2/materials/scripts/Map.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Map.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -11,7 +11,7 @@
cull_hardware none
texture_unit
{
- texture mapgrid.tga
+ texture mapgrid.png
}
}
}
Modified: data/branches/png2/materials/scripts/Ogre.material
===================================================================
--- data/branches/png2/materials/scripts/Ogre.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Ogre.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture spheremap.tga
+ texture spheremap.png
colour_op_ex add src_texture src_current
colour_op_multipass_fallback one one
env_map spherical
@@ -62,7 +62,7 @@
texture_unit
{
- texture WeirdEye.tga
+ texture WeirdEye.png
}
}
}
@@ -77,7 +77,7 @@
texture_unit
{
- texture cursor.tga
+ texture cursor.png
tex_address_mode clamp
}
}
@@ -95,7 +95,7 @@
texture_unit
{
- texture ogreborder.tga
+ texture ogreborder.png
}
}
}
@@ -112,7 +112,7 @@
texture_unit
{
- texture ogreborderUp.tga
+ texture ogreborderUp.png
}
}
}
Modified: data/branches/png2/materials/scripts/OldMovie.material
===================================================================
--- data/branches/png2/materials/scripts/OldMovie.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/OldMovie.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -56,7 +56,7 @@
texture_unit SepiaTx
{
- texture Sepia1D.tga 1d
+ texture Sepia1D.png 1d
tex_coord_set 3
tex_address_mode mirror
filtering point point none
Modified: data/branches/png2/materials/scripts/Orxonox.material
===================================================================
--- data/branches/png2/materials/scripts/Orxonox.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Orxonox.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture bar2c.tga
+ texture bar2c.png
}
}
}
@@ -28,7 +28,7 @@
texture_unit
{
- texture bar2b.tga
+ texture bar2b.png
}
}
}
@@ -46,7 +46,7 @@
texture_unit
{
- texture bar2a.tga
+ texture bar2a.png
}
}
}
@@ -64,7 +64,7 @@
texture_unit
{
- texture bar2.tga
+ texture bar2.png
}
}
}
@@ -82,7 +82,7 @@
texture_unit
{
- texture OrxonoxBlack.tga
+ texture OrxonoxBlack.png
}
}
}
@@ -100,7 +100,7 @@
texture_unit
{
- texture bar1.tga 2d 0 // no mipmapping
+ texture bar1.png 2d 0 // no mipmapping
}
}
}
@@ -118,7 +118,7 @@
texture_unit
{
- texture healthbar_bg.tga 2d 0 // no mipmapping
+ texture healthbar_bg.png 2d 0 // no mipmapping
}
}
}
@@ -135,7 +135,7 @@
texture_unit
{
- texture radar.tga
+ texture radar.png
}
}
}
@@ -153,7 +153,7 @@
texture_unit
{
- texture RadarSquare.tga
+ texture RadarSquare.png
}
}
}
@@ -171,7 +171,7 @@
texture_unit
{
- texture console2.tga
+ texture console2.png
}
}
}
@@ -189,7 +189,7 @@
texture_unit
{
- texture OrxonoxWhite.tga
+ texture OrxonoxWhite.png
}
}
}
@@ -207,7 +207,7 @@
texture_unit
{
- texture OrxonoxWhite.tga
+ texture OrxonoxWhite.png
colour_op_ex modulate src_manual src_current 0 1 0
}
}
@@ -226,7 +226,7 @@
texture_unit
{
- texture arrows.tga
+ texture arrows.png
}
}
}
@@ -244,7 +244,7 @@
texture_unit
{
- texture tdc.tga
+ texture tdc.png
}
}
}
@@ -262,7 +262,7 @@
texture_unit
{
- texture crosshair2.tga
+ texture crosshair2.png
}
}
}
@@ -280,7 +280,7 @@
texture_unit
{
- texture crosshair.tga
+ texture crosshair.png
}
}
}
Modified: data/branches/png2/materials/scripts/OrxonoxSky.material
===================================================================
--- data/branches/png2/materials/scripts/OrxonoxSky.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/OrxonoxSky.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -81,7 +81,7 @@
texture_unit
{
- cubic_texture bluestar.tga separateUV
+ cubic_texture bluestar.png separateUV
tex_address_mode clamp
}
}
Modified: data/branches/png2/materials/scripts/PE_materials.material
===================================================================
--- data/branches/png2/materials/scripts/PE_materials.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/PE_materials.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -14,7 +14,7 @@
texture_unit
{
- texture flare.tga
+ texture flare.png
}
}
}
@@ -32,7 +32,7 @@
texture_unit
{
- texture flare.tga
+ texture flare.png
}
}
}
@@ -50,7 +50,7 @@
texture_unit
{
- texture bigflame.tga
+ texture bigflame.png
}
}
}
@@ -68,7 +68,7 @@
texture_unit
{
- texture smoke.tga
+ texture smoke.png
}
}
}
@@ -86,7 +86,7 @@
texture_unit
{
- texture smoke2.tga
+ texture smoke2.png
}
}
}
@@ -104,7 +104,7 @@
texture_unit
{
- texture smoke3.tga
+ texture smoke3.png
}
}
}
@@ -122,7 +122,7 @@
texture_unit
{
- texture smoke4.tga
+ texture smoke4.png
}
}
}
@@ -140,7 +140,7 @@
texture_unit
{
- texture explosion.tga
+ texture explosion.png
}
}
}
@@ -158,7 +158,7 @@
texture_unit
{
- texture explosion3.tga
+ texture explosion3.png
}
}
}
@@ -176,7 +176,7 @@
texture_unit
{
- texture ring_flare.tga
+ texture ring_flare.png
}
}
}
@@ -194,7 +194,7 @@
texture_unit
{
- texture ring_flare2.tga
+ texture ring_flare2.png
}
}
}
@@ -212,7 +212,7 @@
texture_unit
{
- texture flaretrail.tga
+ texture flaretrail.png
}
}
}
@@ -230,7 +230,7 @@
texture_unit
{
- texture streak.tga
+ texture streak.png
}
}
}
Modified: data/branches/png2/materials/scripts/Scene.material
===================================================================
--- data/branches/png2/materials/scripts/Scene.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Scene.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1
texture_unit
{
- texture asteroid.tga
+ texture asteroid.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/Shield.material
===================================================================
--- data/branches/png2/materials/scripts/Shield.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Shield.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture shield.tga
+ texture shield.png
}
}
}
Modified: data/branches/png2/materials/scripts/Sphere2.material
===================================================================
--- data/branches/png2/materials/scripts/Sphere2.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Sphere2.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture sphere.tga
+ texture sphere.png
}
}
}
Modified: data/branches/png2/materials/scripts/Stats.material
===================================================================
--- data/branches/png2/materials/scripts/Stats.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Stats.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
texture_unit
{
- texture console2.tga
+ texture console2.png
}
}
}
@@ -28,7 +28,7 @@
texture_unit
{
- texture console3.tga
+ texture console3.png
}
}
}
@@ -46,7 +46,7 @@
texture_unit
{
- texture console4.tga
+ texture console4.png
}
}
}
@@ -64,7 +64,7 @@
texture_unit
{
- texture console5.tga
+ texture console5.png
}
}
}
Modified: data/branches/png2/materials/scripts/Test.material
===================================================================
--- data/branches/png2/materials/scripts/Test.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Test.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -11,7 +11,7 @@
texture_unit
{
- texture smoke.tga
+ texture smoke.png
}
}
}
Modified: data/branches/png2/materials/scripts/Trail.material
===================================================================
--- data/branches/png2/materials/scripts/Trail.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/Trail.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -11,7 +11,7 @@
texture_unit
{
- texture backlighttrail.tga
+ texture backlighttrail.png
}
}
}
@@ -31,7 +31,7 @@
texture_unit
{
- texture backlighttrail2.tga
+ texture backlighttrail2.png
}
}
}
Modified: data/branches/png2/materials/scripts/assf.material
===================================================================
--- data/branches/png2/materials/scripts/assf.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/assf.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -8,7 +8,7 @@
specular 0.500000 0.500000 0.500000 12.500000
texture_unit
{
- texture human_assf.tga
+ texture human_assf.png
}
}
}
Modified: data/branches/png2/materials/scripts/assf5.material
===================================================================
--- data/branches/png2/materials/scripts/assf5.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/assf5.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -8,7 +8,7 @@
specular 0.500000 0.500000 0.500000 12.500000
texture_unit
{
- texture human_assf5.tga
+ texture human_assf5.png
}
}
}
Modified: data/branches/png2/materials/scripts/asteroid_ice.material
===================================================================
--- data/branches/png2/materials/scripts/asteroid_ice.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/asteroid_ice.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -12,7 +12,7 @@
depth_write off
texture_unit
{
- texture asteroid_ice.tga
+ texture asteroid_ice.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/asteroids.material
===================================================================
--- data/branches/png2/materials/scripts/asteroids.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/asteroids.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -118,20 +118,20 @@
// Base bump map
texture_unit
{
- texture nmrock.tga
+ texture nmrock.png
colour_op replace
}
// Normalisation cube map
texture_unit
{
- cubic_texture nm.tga combinedUVW
+ cubic_texture nm.png combinedUVW
tex_coord_set 1
tex_address_mode clamp
}
// Normalisation cube map #2
texture_unit
{
- cubic_texture nm.tga combinedUVW
+ cubic_texture nm.png combinedUVW
tex_coord_set 2
tex_address_mode clamp
}
@@ -153,7 +153,7 @@
scene_blend dest_colour zero
texture_unit
{
- texture rock.tga
+ texture rock.png
}
}
@@ -205,13 +205,13 @@
// Base bump map
texture_unit
{
- texture nmrock.tga
+ texture nmrock.png
colour_op replace
}
// Normalisation cube map, with dot product on bump map
texture_unit
{
- cubic_texture nm.tga combinedUVW
+ cubic_texture nm.png combinedUVW
tex_coord_set 1
tex_address_mode clamp
colour_op_ex dotproduct src_texture src_current
@@ -235,7 +235,7 @@
scene_blend dest_colour zero
texture_unit
{
- texture rock.tga
+ texture rock.png
}
}
Modified: data/branches/png2/materials/scripts/can.material
===================================================================
--- data/branches/png2/materials/scripts/can.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/can.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture can.tga
+ texture can.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/crate.material
===================================================================
--- data/branches/png2/materials/scripts/crate.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/crate.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -11,7 +11,7 @@
texture_unit
{
- texture crate.tga
+ texture crate.png
}
}
}
Modified: data/branches/png2/materials/scripts/cube.material
===================================================================
--- data/branches/png2/materials/scripts/cube.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/cube.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture OrxonoxYELLOW.tga
+ texture OrxonoxYELLOW.png
colour_op modulate
}
}
@@ -36,7 +36,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture OrxonoxGREEN.tga
+ texture OrxonoxGREEN.png
colour_op modulate
}
}
@@ -62,7 +62,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture OrxonoxRED.tga
+ texture OrxonoxRED.png
colour_op modulate
}
}
@@ -88,7 +88,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture OrxonoxORANGE.tga
+ texture OrxonoxORANGE.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/drone.material
===================================================================
--- data/branches/png2/materials/scripts/drone.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/drone.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -6,7 +6,7 @@
{
texture_unit
{
- texture drone.tga
+ texture drone.png
}
}
}
Modified: data/branches/png2/materials/scripts/h2_green.material
===================================================================
--- data/branches/png2/materials/scripts/h2_green.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/h2_green.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture final_gold.tga
+ texture final_gold.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/hoover.material
===================================================================
--- data/branches/png2/materials/scripts/hoover.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/hoover.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -6,7 +6,7 @@
{
texture_unit
{
- texture hoover_turbine.tga
+ texture hoover_turbine.png
}
}
}
@@ -19,7 +19,7 @@
{
texture_unit
{
- texture hoover_gear.tga
+ texture hoover_gear.png
}
}
}
@@ -32,7 +32,7 @@
{
texture_unit
{
- texture hoover_body.tga
+ texture hoover_body.png
}
}
}
Modified: data/branches/png2/materials/scripts/hs-w01.material
===================================================================
--- data/branches/png2/materials/scripts/hs-w01.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/hs-w01.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture hs-w01.tga
+ texture hs-w01.png
colour_op modulate
}
}
@@ -35,7 +35,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture hs-w01.tga
+ texture hs-w01.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/hs-w01s.material
===================================================================
--- data/branches/png2/materials/scripts/hs-w01s.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/hs-w01s.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture hs-w01s.tga
+ texture hs-w01s.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/iceplanet.material
===================================================================
--- data/branches/png2/materials/scripts/iceplanet.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/iceplanet.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -11,7 +11,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture iceplanet.tga
+ texture iceplanet.png
tex_address_mode wrap
filtering trilinear
}
Modified: data/branches/png2/materials/scripts/laserbeam.material
===================================================================
--- data/branches/png2/materials/scripts/laserbeam.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/laserbeam.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -9,7 +9,7 @@
scene_blend add
texture_unit
{
- texture laserbeam.tga
+ texture laserbeam.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/planet.material
===================================================================
--- data/branches/png2/materials/scripts/planet.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/planet.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -40,7 +40,7 @@
texture_unit
{
- texture atmospheretype3.tga
+ texture atmospheretype3.png
}
}
}
@@ -61,7 +61,7 @@
texture_unit
{
- texture atmospheretype1.tga
+ texture atmospheretype1.png
}
}
}
Modified: data/branches/png2/materials/scripts/rock.material
===================================================================
--- data/branches/png2/materials/scripts/rock.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/rock.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -9,7 +9,7 @@
texture_unit
{
- texture rock.tga
+ texture rock.png
}
}
}
Modified: data/branches/png2/materials/scripts/spacecruiser.material
===================================================================
--- data/branches/png2/materials/scripts/spacecruiser.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/spacecruiser.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -8,7 +8,7 @@
specular 0.500000 0.500000 0.500000 12.500000
texture_unit
{
- texture spacesruiser.tga
+ texture spacesruiser.png
}
}
}
Modified: data/branches/png2/materials/scripts/sphere.material
===================================================================
--- data/branches/png2/materials/scripts/sphere.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/sphere.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture OrxonoxRED.tga
+ texture OrxonoxRED.png
colour_op modulate
}
}
Modified: data/branches/png2/materials/scripts/starship.material
===================================================================
--- data/branches/png2/materials/scripts/starship.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/starship.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -7,7 +7,7 @@
specular 0.500000 0.500000 0.500000 12.500000
texture_unit
{
- texture starship.tga
+ texture starship.png
}
}
}
Modified: data/branches/png2/materials/scripts/swallow_material.material
===================================================================
--- data/branches/png2/materials/scripts/swallow_material.material 2010-08-29 16:14:52 UTC (rev 7258)
+++ data/branches/png2/materials/scripts/swallow_material.material 2010-08-29 16:40:57 UTC (rev 7259)
@@ -10,7 +10,7 @@
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture swallow_tex.tga
+ texture swallow_tex.png
colour_op modulate
}
}
More information about the Orxonox-commit
mailing list