- Timestamp:
- Oct 28, 2008, 5:41:28 PM (16 years ago)
- Location:
- code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers
- Files:
-
- 1 added
- 4 moved
-
. (added)
-
DistanceTrigger.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.cc) (1 prop)
-
DistanceTrigger.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.h) (1 prop)
-
Trigger.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc) (1 prop)
-
Trigger.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Trigger.h) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/script_trigger/src/orxonox/objects/DistanceTrigger.cc merged eligible /code/branches/ceguilua/src/orxonox/objects/DistanceTrigger.cc 1802-1808 /code/branches/core3/src/orxonox/objects/DistanceTrigger.cc 1572-1739 /code/branches/gcc43/src/orxonox/objects/DistanceTrigger.cc 1580 /code/branches/gui/src/orxonox/objects/DistanceTrigger.cc 1635-1723 /code/branches/input/src/orxonox/objects/DistanceTrigger.cc 1629-1636
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/script_trigger/src/orxonox/objects/DistanceTrigger.h merged eligible /code/branches/ceguilua/src/orxonox/objects/DistanceTrigger.h 1802-1808 /code/branches/core3/src/orxonox/objects/DistanceTrigger.h 1572-1739 /code/branches/gcc43/src/orxonox/objects/DistanceTrigger.h 1580 /code/branches/gui/src/orxonox/objects/DistanceTrigger.h 1635-1723 /code/branches/input/src/orxonox/objects/DistanceTrigger.h 1629-1636
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/script_trigger/src/orxonox/objects/Trigger.cc merged eligible /code/branches/ceguilua/src/orxonox/objects/Trigger.cc 1802-1808 /code/branches/core3/src/orxonox/objects/Trigger.cc 1572-1739 /code/branches/gcc43/src/orxonox/objects/Trigger.cc 1580 /code/branches/gui/src/orxonox/objects/Trigger.cc 1635-1723 /code/branches/input/src/orxonox/objects/Trigger.cc 1629-1636
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/script_trigger/src/orxonox/objects/Trigger.h merged eligible /code/branches/ceguilua/src/orxonox/objects/Trigger.h 1802-1808 /code/branches/core3/src/orxonox/objects/Trigger.h 1572-1739 /code/branches/gcc43/src/orxonox/objects/Trigger.h 1580 /code/branches/gui/src/orxonox/objects/Trigger.h 1635-1723 /code/branches/input/src/orxonox/objects/Trigger.h 1629-1636
r2026 r2027 35 35 #include "OrxonoxPrereqs.h" 36 36 37 #include " worldentities/PositionableEntity.h"37 #include "objects/worldentities/PositionableEntity.h" 38 38 #include "tools/BillboardSet.h" 39 39 -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.
