- Timestamp:
- Nov 6, 2008, 12:55:07 PM (15 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc merged eligible /code/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.cc 1802-1808 /code/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.cc 1572-1739 /code/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.cc 1580 /code/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.cc 1635-1723 /code/branches/input/src/orxonox/objects/worldentities/PositionableEntity.cc 1629-1636 /code/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.cc 1912-2055 /code/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.cc 1926-2086 /code/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.cc 1894-2088 /code/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc 1295-1953,1955 /code/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc 1925-2094
r2144 r2151 28 28 29 29 #include "OrxonoxStableHeaders.h" 30 #include " PositionableEntity.h"30 #include "StaticEntity.h" 31 31 #include "core/CoreIncludes.h" 32 32 33 33 namespace orxonox 34 34 { 35 CreateFactory( PositionableEntity);35 CreateFactory(StaticEntity); 36 36 37 PositionableEntity::PositionableEntity(BaseObject* creator) : WorldEntity(creator)37 StaticEntity::StaticEntity(BaseObject* creator) : WorldEntity(creator) 38 38 { 39 RegisterObject( PositionableEntity);39 RegisterObject(StaticEntity); 40 40 41 41 this->registerVariables(); 42 42 } 43 43 44 PositionableEntity::~PositionableEntity()44 StaticEntity::~StaticEntity() 45 45 { 46 46 } 47 47 48 void PositionableEntity::registerVariables()48 void StaticEntity::registerVariables() 49 49 { 50 50 REGISTERDATA(this->getPosition().x, network::direction::toclient); -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.