Changeset 8699
- Timestamp:
- Jun 6, 2011, 12:19:03 AM (13 years ago)
- Location:
- data/pool
- Files:
-
- 10 added
- 3 edited
- 6 copied
-
images/textures/AUTHORS (modified) (4 diffs)
-
images/textures/CentralStructure.png (copied) (copied from data/trunk/images/textures/CentralStructure.png) (1 prop)
-
images/textures/Doors.png (copied) (copied from data/trunk/images/textures/Doors.png) (1 prop)
-
images/textures/MainStructure.png (copied) (copied from data/trunk/images/textures/MainStructure.png) (1 prop)
-
images/textures/OuterCompartment.png (copied) (copied from data/trunk/images/textures/OuterCompartment.png) (1 prop)
-
materials/AUTHORS (modified) (1 diff)
-
materials/HydroHarvester.material (copied) (copied from data/trunk/materials/HydroHarvester.material) (1 prop)
-
models/AUTHORS (modified) (1 diff)
-
models/hydrogenharvester (added)
-
models/hydrogenharvester/CentralStructure.psp (added)
-
models/hydrogenharvester/Doors.psp (added)
-
models/hydrogenharvester/HarvesterHull.blend (added)
-
models/hydrogenharvester/HarvesterHullAnim.blend (added)
-
models/hydrogenharvester/HarvesterHullMerged.blend (added)
-
models/hydrogenharvester/HydroHarvester.mesh (copied) (copied from data/trunk/models/HydroHarvester.mesh) (1 prop)
-
models/hydrogenharvester/MainStructure.psp (added)
-
models/hydrogenharvester/OuterCompartment.psp (added)
-
models/hydrogenharvester/info.xml (added)
-
models/hydrogenharvester/screenshot.jpg (added)
Legend:
- Unmodified
- Added
- Removed
-
data/pool/images/textures/AUTHORS
r8157 r8699 12 12 babel-wall6b.jpg Georges Grondin (cc-by-sa) 13 13 can.png Hagen Seifert 14 CentralStructure.png Hans Sjökvist 14 15 CockpitGlass.jpg Mirko Kaiser 15 16 CockpitNose.jpg Mirko Kaiser … … 21 22 Dirt.jpg unknown 22 23 dish.jpg Felix Schulthess 24 Doors.png Hans Sjökvist 23 25 drone.png unknown 24 26 DuBall1.jpg Rocco Bottani, Massimo Maffioli … … 39 41 LightningGun.png Joël Smely 40 42 LightningGun-s.png Joël Smely 43 MainStructure.png Hans Sjökvist 41 44 MetalBare.jpg Benjamin de Capitani 42 45 MetalBase0020_thumbhuge.jpg Benjamin de Capitani … … 48 51 OrxonoxRED.png unknown 49 52 OrxonoxYELLOW.png Reto Grieder 53 OuterCompartment.png Hans Sjökvist 50 54 pirate.jpg Felix Schulthess 51 55 planet.jpg Felix Schulthess -
data/pool/images/textures/CentralStructure.png
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/data/branches/altaudio/images/textures/CentralStructure.png 6211-6263 /data/branches/cleanup/images/textures/CentralStructure.png 7470-7685 /data/branches/media_stripped/images/textures/CentralStructure.png 5591-5657 /data/branches/png2/images/textures/CentralStructure.png 7245-7260
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
data/pool/images/textures/Doors.png
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/data/branches/altaudio/images/textures/Doors.png 6211-6263 /data/branches/cleanup/images/textures/Doors.png 7470-7685 /data/branches/media_stripped/images/textures/Doors.png 5591-5657 /data/branches/png2/images/textures/Doors.png 7245-7260
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
data/pool/images/textures/MainStructure.png
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/data/branches/altaudio/images/textures/MainStructure.png 6211-6263 /data/branches/cleanup/images/textures/MainStructure.png 7470-7685 /data/branches/media_stripped/images/textures/MainStructure.png 5591-5657 /data/branches/png2/images/textures/MainStructure.png 7245-7260
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
data/pool/images/textures/OuterCompartment.png
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/data/branches/altaudio/images/textures/OuterCompartment.png 6211-6263 /data/branches/cleanup/images/textures/OuterCompartment.png 7470-7685 /data/branches/media_stripped/images/textures/OuterCompartment.png 5591-5657 /data/branches/png2/images/textures/OuterCompartment.png 7245-7260
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
data/pool/materials/AUTHORS
r8157 r8699 43 43 hs-w01s.material Hagen Seifert 44 44 HXY.material Benjamin de Capitani 45 HydroHarvester.material Hans Sjökvist 45 46 iceplanet.material Marian Runo 46 47 Invert.material Fabian Landau? -
data/pool/materials/HydroHarvester.material
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/data/branches/altaudio/materials/HydroHarvester.material 6211-6263 /data/branches/cleanup/materials/HydroHarvester.material 7470-7685 /data/branches/media_stripped/materials/HydroHarvester.material 5591-5657 /data/branches/png2/materials/HydroHarvester.material 7245-7260
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
data/pool/models/AUTHORS
r8162 r8699 25 25 duBall/DuBall1.mesh Rocco Bottani, Massimo Maffioli 26 26 duBall/DuBall2.mesh Rocco Bottani, Massimo Maffioli 27 hydrogenharvester/HydroHarvester.mesh Hans Sjökvist 27 28 primitives/axes/axes.mesh Felix Schulthess 28 29 primitives/cone/Cone.mesh Felix Schulthess -
data/pool/models/hydrogenharvester/HydroHarvester.mesh
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/data/branches/altaudio/models/HydroHarvester.mesh 6211-6263 /data/branches/cleanup/models/HydroHarvester.mesh 7470-7685 /data/branches/media_stripped/models/HydroHarvester.mesh 5591-5657 /data/branches/png2/models/HydroHarvester.mesh 7245-7260
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.
