- Timestamp:
- Nov 6, 2008, 12:55:07 PM (16 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h merged eligible /code/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.h 1802-1808 /code/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.h 1572-1739 /code/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.h 1580 /code/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.h 1635-1723 /code/branches/input/src/orxonox/objects/worldentities/PositionableEntity.h 1629-1636 /code/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.h 1912-2055 /code/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.h 1926-2086 /code/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.h 1894-2088 /code/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h 1295-1953,1955 /code/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h 1925-2094
r2144 r2151 27 27 */ 28 28 29 #ifndef _ PositionableEntity_H__30 #define _ PositionableEntity_H__29 #ifndef _StaticEntity_H__ 30 #define _StaticEntity_H__ 31 31 32 32 #include "OrxonoxPrereqs.h" … … 35 35 namespace orxonox 36 36 { 37 class _OrxonoxExport PositionableEntity : public WorldEntity37 class _OrxonoxExport StaticEntity : public WorldEntity 38 38 { 39 39 public: 40 PositionableEntity(BaseObject* creator);41 virtual ~ PositionableEntity();40 StaticEntity(BaseObject* creator); 41 virtual ~StaticEntity(); 42 42 43 43 void registerVariables(); … … 74 74 } 75 75 76 #endif /* _ PositionableEntity_H__ */76 #endif /* _StaticEntity_H__ */ -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.