Changeset 2087 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

Nov 1, 2008, 7:04:09 PM (16 years ago)

Author:

landauf

Message:

merged objecthierarchy branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities)
• src/orxonox/objects/worldentities/Backlight.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.cc)
• src/orxonox/objects/worldentities/Backlight.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.h)
• src/orxonox/objects/worldentities/Billboard.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Billboard.cc)
• src/orxonox/objects/worldentities/Billboard.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Billboard.h)
• src/orxonox/objects/worldentities/BlinkingBillboard.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/BlinkingBillboard.cc)
• src/orxonox/objects/worldentities/BlinkingBillboard.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/BlinkingBillboard.h)
• src/orxonox/objects/worldentities/Camera.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc)
• src/orxonox/objects/worldentities/Camera.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.h)
• src/orxonox/objects/worldentities/CameraPosition.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/CameraPosition.cc)
• src/orxonox/objects/worldentities/CameraPosition.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/CameraPosition.h)
• src/orxonox/objects/worldentities/ControllableEntity.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc)
• src/orxonox/objects/worldentities/ControllableEntity.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h)
• src/orxonox/objects/worldentities/Light.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Light.cc)
• src/orxonox/objects/worldentities/Light.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Light.h)
• src/orxonox/objects/worldentities/Model.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Model.cc)
• src/orxonox/objects/worldentities/Model.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/Model.h)
• src/orxonox/objects/worldentities/MovableEntity.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/MovableEntity.cc)
• src/orxonox/objects/worldentities/MovableEntity.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/MovableEntity.h)
• src/orxonox/objects/worldentities/ParticleEmitter.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleEmitter.cc)
• src/orxonox/objects/worldentities/ParticleEmitter.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleEmitter.h)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.cc)
• src/orxonox/objects/worldentities/ParticleSpawner.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h)
• src/orxonox/objects/worldentities/PositionableEntity.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc)
• src/orxonox/objects/worldentities/PositionableEntity.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h)
• src/orxonox/objects/worldentities/SpawnPoint.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/SpawnPoint.cc)
• src/orxonox/objects/worldentities/SpawnPoint.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/SpawnPoint.h)
• src/orxonox/objects/worldentities/WorldEntity.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc)
• src/orxonox/objects/worldentities/WorldEntity.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.h)
• src/orxonox/objects/worldentities/pawns (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Pawn.cc)
• src/orxonox/objects/worldentities/pawns/Pawn.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Pawn.h)
• src/orxonox/objects/worldentities/pawns/SpaceShip.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/SpaceShip.cc)
• src/orxonox/objects/worldentities/pawns/SpaceShip.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/SpaceShip.h)
• src/orxonox/objects/worldentities/pawns/Spectator.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.cc)
• src/orxonox/objects/worldentities/pawns/Spectator.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.h)
• src/orxonox/objects/worldentities/triggers (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h)
• src/orxonox/objects/worldentities/triggers/EventTrigger.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/EventTrigger.cc)
• src/orxonox/objects/worldentities/triggers/EventTrigger.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/EventTrigger.h)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc)
• src/orxonox/objects/worldentities/triggers/Trigger.h (copied) (copied from code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h)