Changeset 7369 for data/trunk
- Timestamp:
- Sep 6, 2010, 9:35:26 PM (14 years ago)
- Location:
- data/trunk
- Files:
-
- 104 deleted
- 71 edited
- 103 copied
-
. (modified) (view diffs)
-
AUTHORS (modified) (view diffs)
-
gui/imagesets/FairChar.imageset (modified) (view diffs)
-
gui/imagesets/FairChar.png (copied) (copied from data/branches/png2/gui/imagesets/FairChar.png) (view diffs)
-
gui/imagesets/FairChar.tga (deleted)
-
gui/imagesets/GPN-2000-001437.png (copied) (copied from data/branches/png2/gui/imagesets/GPN-2000-001437.png) (view diffs)
-
gui/imagesets/GPN-2000-001437.tga (deleted)
-
gui/imagesets/PickupInventory.imageset (modified) (view diffs)
-
gui/imagesets/ReadMe.txt (modified) (view diffs)
-
gui/imagesets/TaharezGreenLook.imageset (modified) (view diffs)
-
gui/imagesets/TaharezGreenLook.png (copied) (copied from data/branches/png2/gui/imagesets/TaharezGreenLook.png) (view diffs)
-
gui/imagesets/TaharezGreenLook.tga (deleted)
-
gui/imagesets/TaharezLook.imageset (modified) (view diffs)
-
gui/imagesets/TaharezLook.png (copied) (copied from data/branches/png2/gui/imagesets/TaharezLook.png) (view diffs)
-
gui/imagesets/TaharezLook.tga (deleted)
-
gui/imagesets/Vanilla.imageset (modified) (view diffs)
-
gui/imagesets/WindowsLook.imageset (modified) (view diffs)
-
gui/imagesets/WindowsLook.png (copied) (copied from data/branches/png2/gui/imagesets/WindowsLook.png) (view diffs)
-
gui/imagesets/WindowsLook.tga (deleted)
-
gui/imagesets/main_menu_1.jpg (modified) (view diffs)
-
gui/imagesets/pickup.png (copied) (copied from data/branches/png2/gui/imagesets/pickup.png) (view diffs)
-
gui/imagesets/pickup.tga (deleted)
-
gui/imagesets/vanilla.png (copied) (copied from data/branches/png2/gui/imagesets/vanilla.png) (view diffs)
-
gui/imagesets/vanilla.tga (deleted)
-
materials/scripts/3arrowsup.material (modified) (view diffs)
-
materials/scripts/Arrow.material (modified) (view diffs)
-
materials/scripts/Asterix.material (modified) (view diffs)
-
materials/scripts/Banners.material (modified) (view diffs)
-
materials/scripts/Bump_Specular.material (modified) (view diffs)
-
materials/scripts/Carrier.material (modified) (view diffs)
-
materials/scripts/Cone.material (modified) (view diffs)
-
materials/scripts/Console.material (modified) (view diffs)
-
materials/scripts/Cross.material (modified) (view diffs)
-
materials/scripts/Example.material (modified) (view diffs)
-
materials/scripts/Eye.material (modified) (view diffs)
-
materials/scripts/Flares.material (modified) (view diffs)
-
materials/scripts/Glass.material (modified) (view diffs)
-
materials/scripts/HXY.material (modified) (view diffs)
-
materials/scripts/LightningGun-s.material (modified) (view diffs)
-
materials/scripts/LightningGun-s.tga (deleted)
-
materials/scripts/LightningGun.material (modified) (view diffs)
-
materials/scripts/Map.material (modified) (view diffs)
-
materials/scripts/Ogre.material (modified) (view diffs)
-
materials/scripts/OldMovie.material (modified) (view diffs)
-
materials/scripts/Orxonox.material (modified) (view diffs)
-
materials/scripts/OrxonoxSky.material (modified) (view diffs)
-
materials/scripts/PE_materials.material (modified) (view diffs)
-
materials/scripts/Scene.material (modified) (view diffs)
-
materials/scripts/Shield.material (modified) (view diffs)
-
materials/scripts/Sphere2.material (modified) (view diffs)
-
materials/scripts/Stats.material (modified) (view diffs)
-
materials/scripts/Test.material (modified) (view diffs)
-
materials/scripts/Trail.material (modified) (view diffs)
-
materials/scripts/Transporter.material (modified) (view diffs)
-
materials/scripts/assf.material (modified) (view diffs)
-
materials/scripts/assf5.material (modified) (view diffs)
-
materials/scripts/asteroid_ice.material (modified) (view diffs)
-
materials/scripts/asteroids.material (modified) (view diffs)
-
materials/scripts/can.material (modified) (view diffs)
-
materials/scripts/crate.material (modified) (view diffs)
-
materials/scripts/cube.material (modified) (view diffs)
-
materials/scripts/drone.material (modified) (view diffs)
-
materials/scripts/h2_green.material (modified) (view diffs)
-
materials/scripts/hoover.material (modified) (view diffs)
-
materials/scripts/hs-w01.material (modified) (view diffs)
-
materials/scripts/hs-w01s.material (modified) (view diffs)
-
materials/scripts/iceplanet.material (modified) (view diffs)
-
materials/scripts/laserbeam.material (modified) (view diffs)
-
materials/scripts/planet.material (modified) (view diffs)
-
materials/scripts/rock.material (modified) (view diffs)
-
materials/scripts/spacecruiser.material (modified) (view diffs)
-
materials/scripts/sphere.material (modified) (view diffs)
-
materials/scripts/starship.material (modified) (view diffs)
-
materials/scripts/swallow_material.material (modified) (view diffs)
-
materials/textures/3arrowsup.png (copied) (copied from data/branches/png2/materials/textures/3arrowsup.png) (view diffs)
-
materials/textures/3arrowsup.tga (deleted)
-
materials/textures/CockpitGlass.jpg (modified) (view diffs)
-
materials/textures/Drone.png (deleted)
-
materials/textures/DroneBanner.png (copied) (copied from data/branches/png2/materials/textures/DroneBanner.png) (view diffs)
-
materials/textures/Formation.png (modified) (view diffs)
-
materials/textures/LightningBall_1.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_1.png) (view diffs)
-
materials/textures/LightningBall_1.tga (deleted)
-
materials/textures/LightningBall_2.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_2.png) (view diffs)
-
materials/textures/LightningBall_2.tga (deleted)
-
materials/textures/LightningBall_3.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_3.png) (view diffs)
-
materials/textures/LightningBall_3.tga (deleted)
-
materials/textures/LightningBall_4.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_4.png) (view diffs)
-
materials/textures/LightningBall_4.tga (deleted)
-
materials/textures/LightningBall_5.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_5.png) (view diffs)
-
materials/textures/LightningBall_5.tga (deleted)
-
materials/textures/LightningBall_6.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_6.png) (view diffs)
-
materials/textures/LightningBall_6.tga (deleted)
-
materials/textures/LightningBall_7.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_7.png) (view diffs)
-
materials/textures/LightningBall_7.tga (deleted)
-
materials/textures/LightningBall_8.png (copied) (copied from data/branches/png2/materials/textures/LightningBall_8.png) (view diffs)
-
materials/textures/LightningBall_8.tga (deleted)
-
materials/textures/LightningGun-s.png (copied) (copied from data/branches/png2/materials/textures/LightningGun-s.png) (view diffs)
-
materials/textures/LightningGun.png (copied) (copied from data/branches/png2/materials/textures/LightningGun.png) (view diffs)
-
materials/textures/LightningGun.tga (deleted)
-
materials/textures/Lightning_gun4.png (copied) (copied from data/branches/png2/materials/textures/Lightning_gun4.png) (view diffs)
-
materials/textures/Lightning_gun4.tga (deleted)
-
materials/textures/Lightning_gun_pic2.png (copied) (copied from data/branches/png2/materials/textures/Lightning_gun_pic2.png) (view diffs)
-
materials/textures/Lightning_gun_pic2.tga (deleted)
-
materials/textures/OrxonoxBlack.png (copied) (copied from data/branches/png2/materials/textures/OrxonoxBlack.png) (view diffs)
-
materials/textures/OrxonoxBlack.tga (deleted)
-
materials/textures/OrxonoxGREEN.png (copied) (copied from data/branches/png2/materials/textures/OrxonoxGREEN.png) (view diffs)
-
materials/textures/OrxonoxGREEN.tga (deleted)
-
materials/textures/OrxonoxORANGE.png (copied) (copied from data/branches/png2/materials/textures/OrxonoxORANGE.png) (view diffs)
-
materials/textures/OrxonoxORANGE.tga (deleted)
-
materials/textures/OrxonoxRED.png (copied) (copied from data/branches/png2/materials/textures/OrxonoxRED.png) (view diffs)
-
materials/textures/OrxonoxRED.tga (deleted)
-
materials/textures/OrxonoxYELLOW.png (copied) (copied from data/branches/png2/materials/textures/OrxonoxYELLOW.png) (view diffs)
-
materials/textures/OrxonoxYELLOW.tga (deleted)
-
materials/textures/Pickups.png (modified) (view diffs)
-
materials/textures/PlasmaBlau.jpg (deleted)
-
materials/textures/PlasmaBlau.png (copied) (copied from data/branches/png2/materials/textures/PlasmaBlau.png) (view diffs)
-
materials/textures/RadarDot.png (copied) (copied from data/branches/png2/materials/textures/RadarDot.png) (view diffs)
-
materials/textures/RadarDot.tga (deleted)
-
materials/textures/RadarSquare.png (copied) (copied from data/branches/png2/materials/textures/RadarSquare.png) (view diffs)
-
materials/textures/RadarSquare.tga (deleted)
-
materials/textures/RadarTriangle.png (copied) (copied from data/branches/png2/materials/textures/RadarTriangle.png) (view diffs)
-
materials/textures/RadarTriangle.tga (deleted)
-
materials/textures/Sepia1D.png (copied) (copied from data/branches/png2/materials/textures/Sepia1D.png) (view diffs)
-
materials/textures/Sepia1D.tga (deleted)
-
materials/textures/arrow.png (copied) (copied from data/branches/png2/materials/textures/arrow.png) (view diffs)
-
materials/textures/arrow.tga (deleted)
-
materials/textures/arrows.png (copied) (copied from data/branches/png2/materials/textures/arrows.png) (view diffs)
-
materials/textures/arrows.tga (deleted)
-
materials/textures/asterix.png (copied) (copied from data/branches/png2/materials/textures/asterix.png) (view diffs)
-
materials/textures/asterix.tga (deleted)
-
materials/textures/asteroid.png (copied) (copied from data/branches/png2/materials/textures/asteroid.png) (view diffs)
-
materials/textures/asteroid.tga (deleted)
-
materials/textures/asteroid_ice.png (copied) (copied from data/branches/png2/materials/textures/asteroid_ice.png) (view diffs)
-
materials/textures/asteroid_ice.tga (deleted)
-
materials/textures/atmospheretype1.png (copied) (copied from data/branches/png2/materials/textures/atmospheretype1.png) (view diffs)
-
materials/textures/atmospheretype1.tga (deleted)
-
materials/textures/atmospheretype2.png (copied) (copied from data/branches/png2/materials/textures/atmospheretype2.png) (view diffs)
-
materials/textures/atmospheretype2.tga (deleted)
-
materials/textures/atmospheretype3.png (copied) (copied from data/branches/png2/materials/textures/atmospheretype3.png) (view diffs)
-
materials/textures/atmospheretype3.tga (deleted)
-
materials/textures/atmospheretype4.png (copied) (copied from data/branches/png2/materials/textures/atmospheretype4.png) (view diffs)
-
materials/textures/atmospheretype4.tga (deleted)
-
materials/textures/atmospheretype5.png (copied) (copied from data/branches/png2/materials/textures/atmospheretype5.png) (view diffs)
-
materials/textures/atmospheretype5.tga (deleted)
-
materials/textures/backGround.png (copied) (copied from data/branches/png2/materials/textures/backGround.png) (view diffs)
-
materials/textures/backGround.tga (deleted)
-
materials/textures/backlightflare.png (copied) (copied from data/branches/png2/materials/textures/backlightflare.png) (view diffs)
-
materials/textures/backlightflare.tga (deleted)
-
materials/textures/backlighttrail.png (copied) (copied from data/branches/png2/materials/textures/backlighttrail.png) (view diffs)
-
materials/textures/backlighttrail.tga (deleted)
-
materials/textures/backlighttrail2.png (copied) (copied from data/branches/png2/materials/textures/backlighttrail2.png) (view diffs)
-
materials/textures/backlighttrail2.tga (deleted)
-
materials/textures/bar1.png (copied) (copied from data/branches/png2/materials/textures/bar1.png) (view diffs)
-
materials/textures/bar1.tga (deleted)
-
materials/textures/bar2.png (copied) (copied from data/branches/png2/materials/textures/bar2.png) (view diffs)
-
materials/textures/bar2.tga (deleted)
-
materials/textures/bar2a.png (copied) (copied from data/branches/png2/materials/textures/bar2a.png) (view diffs)
-
materials/textures/bar2a.tga (deleted)
-
materials/textures/bar2b.png (copied) (copied from data/branches/png2/materials/textures/bar2b.png) (view diffs)
-
materials/textures/bar2b.tga (deleted)
-
materials/textures/bar2c.png (copied) (copied from data/branches/png2/materials/textures/bar2c.png) (view diffs)
-
materials/textures/bar2c.tga (deleted)
-
materials/textures/bigflame.png (copied) (copied from data/branches/png2/materials/textures/bigflame.png) (view diffs)
-
materials/textures/bigflame.tga (deleted)
-
materials/textures/bigflare1.png (copied) (copied from data/branches/png2/materials/textures/bigflare1.png) (view diffs)
-
materials/textures/bigflare1.tga (deleted)
-
materials/textures/can.png (copied) (copied from data/branches/png2/materials/textures/can.png) (view diffs)
-
materials/textures/can.tga (deleted)
-
materials/textures/console2.png (copied) (copied from data/branches/png2/materials/textures/console2.png) (view diffs)
-
materials/textures/console2.tga (deleted)
-
materials/textures/console3.png (copied) (copied from data/branches/png2/materials/textures/console3.png) (view diffs)
-
materials/textures/console3.tga (deleted)
-
materials/textures/console4.png (copied) (copied from data/branches/png2/materials/textures/console4.png) (view diffs)
-
materials/textures/console4.tga (deleted)
-
materials/textures/console5.png (copied) (copied from data/branches/png2/materials/textures/console5.png) (view diffs)
-
materials/textures/console5.tga (deleted)
-
materials/textures/crate.png (copied) (copied from data/branches/png2/materials/textures/crate.png) (view diffs)
-
materials/textures/crate.tga (deleted)
-
materials/textures/cross.png (copied) (copied from data/branches/png2/materials/textures/cross.png) (view diffs)
-
materials/textures/cross.tga (deleted)
-
materials/textures/crosshair.png (copied) (copied from data/branches/png2/materials/textures/crosshair.png) (view diffs)
-
materials/textures/crosshair.tga (deleted)
-
materials/textures/crosshair2.png (copied) (copied from data/branches/png2/materials/textures/crosshair2.png) (view diffs)
-
materials/textures/crosshair2.tga (deleted)
-
materials/textures/cursor.png (copied) (copied from data/branches/png2/materials/textures/cursor.png) (view diffs)
-
materials/textures/cursor.tga (deleted)
-
materials/textures/cursor_console.png (copied) (copied from data/branches/png2/materials/textures/cursor_console.png) (view diffs)
-
materials/textures/cursor_console.tga (deleted)
-
materials/textures/damageoverlaybottom.png (modified) (view diffs)
-
materials/textures/damageoverlayleft.png (modified) (view diffs)
-
materials/textures/damageoverlayright.png (modified) (view diffs)
-
materials/textures/damageoverlaytop.png (modified) (view diffs)
-
materials/textures/directionarrows1.png (modified) (view diffs)
-
materials/textures/directionarrows2.png (modified) (view diffs)
-
materials/textures/directionarrows3.png (modified) (view diffs)
-
materials/textures/directionarrows4.png (modified) (view diffs)
-
materials/textures/drone.png (copied) (copied from data/branches/png2/materials/textures/drone.png) (view diffs)
-
materials/textures/drone.tga (deleted)
-
materials/textures/explosion.png (copied) (copied from data/branches/png2/materials/textures/explosion.png) (view diffs)
-
materials/textures/explosion.tga (deleted)
-
materials/textures/explosion3.png (copied) (copied from data/branches/png2/materials/textures/explosion3.png) (view diffs)
-
materials/textures/explosion3.tga (deleted)
-
materials/textures/eye.png (copied) (copied from data/branches/png2/materials/textures/eye.png) (view diffs)
-
materials/textures/eye.tga (deleted)
-
materials/textures/final_gold.png (copied) (copied from data/branches/png2/materials/textures/final_gold.png) (view diffs)
-
materials/textures/final_gold.tga (deleted)
-
materials/textures/flare.png (copied) (copied from data/branches/png2/materials/textures/flare.png) (view diffs)
-
materials/textures/flare.tga (deleted)
-
materials/textures/flare2.png (copied) (copied from data/branches/png2/materials/textures/flare2.png) (view diffs)
-
materials/textures/flare2.tga (deleted)
-
materials/textures/flare2_1.png (copied) (copied from data/branches/png2/materials/textures/flare2_1.png) (view diffs)
-
materials/textures/flare2_1.tga (deleted)
-
materials/textures/flare3.png (copied) (copied from data/branches/png2/materials/textures/flare3.png) (view diffs)
-
materials/textures/flare3.tga (deleted)
-
materials/textures/flaretrail.png (copied) (copied from data/branches/png2/materials/textures/flaretrail.png) (view diffs)
-
materials/textures/flaretrail.tga (deleted)
-
materials/textures/glass01.jpg (deleted)
-
materials/textures/glass01.png (copied) (copied from data/branches/png2/materials/textures/glass01.png) (view diffs)
-
materials/textures/glass02.jpg (deleted)
-
materials/textures/glass02.png (copied) (copied from data/branches/png2/materials/textures/glass02.png) (view diffs)
-
materials/textures/healthbar_bar.png (copied) (copied from data/branches/png2/materials/textures/healthbar_bar.png) (view diffs)
-
materials/textures/healthbar_bar.tga (deleted)
-
materials/textures/healthbar_bg.png (copied) (copied from data/branches/png2/materials/textures/healthbar_bg.png) (view diffs)
-
materials/textures/healthbar_bg.tga (deleted)
-
materials/textures/hs-w01.png (copied) (copied from data/branches/png2/materials/textures/hs-w01.png) (view diffs)
-
materials/textures/hs-w01.tga (deleted)
-
materials/textures/hs-w01_reduced.png (modified) (view diffs)
-
materials/textures/hs-w01s.png (copied) (copied from data/branches/png2/materials/textures/hs-w01s.png) (view diffs)
-
materials/textures/hs-w01s.tga (deleted)
-
materials/textures/iceplanet.png (copied) (copied from data/branches/png2/materials/textures/iceplanet.png) (view diffs)
-
materials/textures/iceplanet.tga (deleted)
-
materials/textures/laserbeam.png (copied) (copied from data/branches/png2/materials/textures/laserbeam.png) (view diffs)
-
materials/textures/laserbeam.tga (deleted)
-
materials/textures/mapgrid.png (copied) (copied from data/branches/png2/materials/textures/mapgrid.png) (view diffs)
-
materials/textures/mapgrid.tga (deleted)
-
materials/textures/ogrelogo.png (copied) (copied from data/branches/png2/materials/textures/ogrelogo.png) (view diffs)
-
materials/textures/ogrelogo.tga (deleted)
-
materials/textures/plasmaSilver_Tube.jpg (deleted)
-
materials/textures/plasmaSilver_Tube.png (copied) (copied from data/branches/png2/materials/textures/plasmaSilver_Tube.png) (view diffs)
-
materials/textures/plasmaSilver_Tube.tga (deleted)
-
materials/textures/radar.png (copied) (copied from data/branches/png2/materials/textures/radar.png) (view diffs)
-
materials/textures/radar.tga (deleted)
-
materials/textures/ring_flare.png (copied) (copied from data/branches/png2/materials/textures/ring_flare.png) (view diffs)
-
materials/textures/ring_flare.tga (deleted)
-
materials/textures/ring_flare2.png (copied) (copied from data/branches/png2/materials/textures/ring_flare2.png) (view diffs)
-
materials/textures/ring_flare2.tga (deleted)
-
materials/textures/rock.png (copied) (copied from data/branches/png2/materials/textures/rock.png) (view diffs)
-
materials/textures/rock.tga (deleted)
-
materials/textures/rust.png (copied) (copied from data/branches/png2/materials/textures/rust.png) (view diffs)
-
materials/textures/rust.tga (deleted)
-
materials/textures/shield.png (copied) (copied from data/branches/png2/materials/textures/shield.png) (view diffs)
-
materials/textures/shield.tga (deleted)
-
materials/textures/smoke.png (copied) (copied from data/branches/png2/materials/textures/smoke.png) (view diffs)
-
materials/textures/smoke.tga (deleted)
-
materials/textures/smoke2.png (copied) (copied from data/branches/png2/materials/textures/smoke2.png) (view diffs)
-
materials/textures/smoke2.tga (deleted)
-
materials/textures/smoke3.png (copied) (copied from data/branches/png2/materials/textures/smoke3.png) (view diffs)
-
materials/textures/smoke3.tga (deleted)
-
materials/textures/smoke4.png (copied) (copied from data/branches/png2/materials/textures/smoke4.png) (view diffs)
-
materials/textures/smoke4.tga (deleted)
-
materials/textures/smokecolors.png (copied) (copied from data/branches/png2/materials/textures/smokecolors.png) (view diffs)
-
materials/textures/smokecolors.tga (deleted)
-
materials/textures/spacesruiser.png (copied) (copied from data/branches/png2/materials/textures/spacesruiser.png) (view diffs)
-
materials/textures/spacesruiser.tga (deleted)
-
materials/textures/sphere.png (copied) (copied from data/branches/png2/materials/textures/sphere.png) (view diffs)
-
materials/textures/sphere.tga (deleted)
-
materials/textures/starship.png (copied) (copied from data/branches/png2/materials/textures/starship.png) (view diffs)
-
materials/textures/starship.tga (deleted)
-
materials/textures/stockstealth.jpeg (deleted)
-
materials/textures/stockstealth.jpg (copied) (copied from data/branches/png2/materials/textures/stockstealth.jpg) (view diffs)
-
materials/textures/streak.png (copied) (copied from data/branches/png2/materials/textures/streak.png) (view diffs)
-
materials/textures/streak.tga (deleted)
-
materials/textures/swallow_tex.png (copied) (copied from data/branches/png2/materials/textures/swallow_tex.png) (view diffs)
-
materials/textures/swallow_tex.tga (deleted)
-
materials/textures/tdc.png (copied) (copied from data/branches/png2/materials/textures/tdc.png) (view diffs)
-
materials/textures/tdc.tga (deleted)
-
materials/textures/white.png (copied) (copied from data/branches/png2/materials/textures/white.png) (view diffs)
-
materials/textures/white.tga (deleted)
-
data/trunk
- Property svn:mergeinfo changed
/data/branches/png2 (added) merged: 7245-7246,7250-7260
- Property svn:mergeinfo changed
-
data/trunk/gui/imagesets/main_menu_1.jpg
- Property svn:mergeinfo changed (with no actual effect on merging)
-
data/trunk/materials/textures/CockpitGlass.jpg
- Property svn:mime-type set to application/octet-stream
-
data/trunk/materials/textures/damageoverlaybottom.png
- Property svn:executable deleted
-
data/trunk/materials/textures/damageoverlayleft.png
- Property svn:executable deleted
-
data/trunk/materials/textures/damageoverlayright.png
- Property svn:executable deleted
-
data/trunk/materials/textures/damageoverlaytop.png
- Property svn:executable deleted
-
data/trunk/materials/textures/directionarrows1.png
- Property svn:executable deleted
-
data/trunk/materials/textures/directionarrows2.png
- Property svn:executable deleted
-
data/trunk/materials/textures/directionarrows3.png
- Property svn:executable deleted
-
data/trunk/materials/textures/directionarrows4.png
- Property svn:executable deleted
Note: See TracChangeset
for help on using the changeset viewer.
