Changeset 7708 for data/trunk/materials

Timestamp:

Dec 3, 2010, 2:36:50 PM (14 years ago)

Author:

dafrick

Message:

Merging cleanup branch. You will need to update your data repository as well as your local copy of the code.

Location:

data/trunk

Files:

• . (modified) (1 prop)
• materials/3arrowsup.material (copied) (copied from data/branches/cleanup/materials/3arrowsup.material)
• materials/Arrow.material (copied) (copied from data/branches/cleanup/materials/Arrow.material)
• materials/Asterix.material (copied) (copied from data/branches/cleanup/materials/Asterix.material)
• materials/Banners.material (copied) (copied from data/branches/cleanup/materials/Banners.material)
• materials/BlackAndWhite.material (copied) (copied from data/branches/cleanup/materials/BlackAndWhite.material)
• materials/Bloom.material (copied) (copied from data/branches/cleanup/materials/Bloom.material)
• materials/Bump_Specular.material (copied) (copied from data/branches/cleanup/materials/Bump_Specular.material)
• materials/Carrier.material (copied) (copied from data/branches/cleanup/materials/Carrier.material)
• materials/Cone.material (copied) (copied from data/branches/cleanup/materials/Cone.material)
• materials/Console.material (copied) (copied from data/branches/cleanup/materials/Console.material)
• materials/Cross.material (copied) (copied from data/branches/cleanup/materials/Cross.material)
• materials/CuboidSpaceStation.material (copied) (copied from data/branches/cleanup/materials/CuboidSpaceStation.material)
• materials/DuBall.material (copied) (copied from data/branches/cleanup/materials/DuBall.material)
• materials/Embossed.material (copied) (copied from data/branches/cleanup/materials/Embossed.material)
• materials/Example.material (copied) (copied from data/branches/cleanup/materials/Example.material)
• materials/Examples.compositor (copied) (copied from data/branches/cleanup/materials/Examples.compositor)
• materials/Examples.program (copied) (copied from data/branches/cleanup/materials/Examples.program)
• materials/Eye.material (copied) (copied from data/branches/cleanup/materials/Eye.material)
• materials/Flares.material (copied) (copied from data/branches/cleanup/materials/Flares.material)
• materials/Glass.material (copied) (copied from data/branches/cleanup/materials/Glass.material)
• materials/HXY.material (copied) (copied from data/branches/cleanup/materials/HXY.material)
• materials/Invert.material (copied) (copied from data/branches/cleanup/materials/Invert.material)
• materials/Laplace.material (copied) (copied from data/branches/cleanup/materials/Laplace.material)
• materials/LightningGun-s.material (copied) (copied from data/branches/cleanup/materials/LightningGun-s.material)
• materials/LightningGun.material (copied) (copied from data/branches/cleanup/materials/LightningGun.material)
• materials/Map.material (copied) (copied from data/branches/cleanup/materials/Map.material)
• materials/MotionBlur.compositor (copied) (copied from data/branches/cleanup/materials/MotionBlur.compositor)
• materials/MotionBlur.material (copied) (copied from data/branches/cleanup/materials/MotionBlur.material)
• materials/Ogre.material (copied) (copied from data/branches/cleanup/materials/Ogre.material)
• materials/OldMovie.material (copied) (copied from data/branches/cleanup/materials/OldMovie.material)
• materials/OldTV.material (copied) (copied from data/branches/cleanup/materials/OldTV.material)
• materials/Orxonox.material (copied) (copied from data/branches/cleanup/materials/Orxonox.material)
• materials/OrxonoxSky.material (copied) (copied from data/branches/cleanup/materials/OrxonoxSky.material)
• materials/PE_materials.material (copied) (copied from data/branches/cleanup/materials/PE_materials.material)
• materials/Posterize.material (copied) (copied from data/branches/cleanup/materials/Posterize.material)
• materials/RadialBlur.material (copied) (copied from data/branches/cleanup/materials/RadialBlur.material)
• materials/Scene.material (copied) (copied from data/branches/cleanup/materials/Scene.material)
• materials/Shaders.compositor (copied) (copied from data/branches/cleanup/materials/Shaders.compositor)
• materials/SharpenEdges.material (copied) (copied from data/branches/cleanup/materials/SharpenEdges.material)
• materials/Shield.material (copied) (copied from data/branches/cleanup/materials/Shield.material)
• materials/Sphere2.material (copied) (copied from data/branches/cleanup/materials/Sphere2.material)
• materials/Stats.material (copied) (copied from data/branches/cleanup/materials/Stats.material)
• materials/StdQuad_vp.program (copied) (copied from data/branches/cleanup/materials/StdQuad_vp.program)
• materials/Test.material (copied) (copied from data/branches/cleanup/materials/Test.material)
• materials/Tiling.material (copied) (copied from data/branches/cleanup/materials/Tiling.material)
• materials/ToonShader.material (copied) (copied from data/branches/cleanup/materials/ToonShader.material)
• materials/Trail.material (copied) (copied from data/branches/cleanup/materials/Trail.material)
• materials/Transparency.material (copied) (copied from data/branches/cleanup/materials/Transparency.material)
• materials/Transporter.material (copied) (copied from data/branches/cleanup/materials/Transporter.material)
• materials/UEATransporter036.material (copied) (copied from data/branches/cleanup/materials/UEATransporter036.material)
• materials/assf.material (copied) (copied from data/branches/cleanup/materials/assf.material)
• materials/assf5.material (copied) (copied from data/branches/cleanup/materials/assf5.material)
• materials/assff.material (copied) (copied from data/branches/cleanup/materials/assff.material)
• materials/asteroid_ice.material (copied) (copied from data/branches/cleanup/materials/asteroid_ice.material)
• materials/asteroid_y.material (copied) (copied from data/branches/cleanup/materials/asteroid_y.material)
• materials/asteroids.material (copied) (copied from data/branches/cleanup/materials/asteroids.material)
• materials/axes.material (copied) (copied from data/branches/cleanup/materials/axes.material)
• materials/can.material (copied) (copied from data/branches/cleanup/materials/can.material)
• materials/crate.material (copied) (copied from data/branches/cleanup/materials/crate.material)
• materials/cube.material (copied) (copied from data/branches/cleanup/materials/cube.material)
• materials/drone.material (copied) (copied from data/branches/cleanup/materials/drone.material)
• materials/earth.material (copied) (copied from data/branches/cleanup/materials/earth.material)
• materials/ghost.material (copied) (copied from data/branches/cleanup/materials/ghost.material)
• materials/h2_green.material (copied) (copied from data/branches/cleanup/materials/h2_green.material)
• materials/hdr.material (copied) (copied from data/branches/cleanup/materials/hdr.material)
• materials/hoover.material (copied) (copied from data/branches/cleanup/materials/hoover.material)
• materials/hs-w01.material (copied) (copied from data/branches/cleanup/materials/hs-w01.material)
• materials/hs-w01_reduced.material (copied) (copied from data/branches/cleanup/materials/hs-w01_reduced.material)
• materials/hs-w01s.material (copied) (copied from data/branches/cleanup/materials/hs-w01s.material)
• materials/iceplanet.material (copied) (copied from data/branches/cleanup/materials/iceplanet.material)
• materials/jumpthrust.material (copied) (copied from data/branches/cleanup/materials/jumpthrust.material)
• materials/laserbeam.material (copied) (copied from data/branches/cleanup/materials/laserbeam.material)
• materials/pirate.material (copied) (copied from data/branches/cleanup/materials/pirate.material)
• materials/plane.material (copied) (copied from data/branches/cleanup/materials/plane.material)
• materials/planet.material (copied) (copied from data/branches/cleanup/materials/planet.material)
• materials/programs (deleted)
• materials/rock.material (copied) (copied from data/branches/cleanup/materials/rock.material)
• materials/rocket.material (copied) (copied from data/branches/cleanup/materials/rocket.material)
• materials/satellite.material (copied) (copied from data/branches/cleanup/materials/satellite.material)
• materials/scripts (deleted)
• materials/spacecruiser.material (copied) (copied from data/branches/cleanup/materials/spacecruiser.material)
• materials/spacecruiser_16.material (copied) (copied from data/branches/cleanup/materials/spacecruiser_16.material)
• materials/sphere.material (copied) (copied from data/branches/cleanup/materials/sphere.material)
• materials/starship.material (copied) (copied from data/branches/cleanup/materials/starship.material)
• materials/swallow_material.material (copied) (copied from data/branches/cleanup/materials/swallow_material.material)
• materials/textures (deleted)
• materials/tomato.material (copied) (copied from data/branches/cleanup/materials/tomato.material)
• materials/wrench.material (copied) (copied from data/branches/cleanup/materials/wrench.material)