- Timestamp:
- Oct 28, 2008, 5:41:28 PM (16 years ago)
- Location:
- code/branches/objecthierarchy/src/orxonox/objects/worldentities
- Files:
-
- 1 added
- 1 edited
- 10 moved
-
Backlight.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Backlight.cc) (1 prop)
-
Backlight.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Backlight.h) (1 prop)
-
Camera.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Camera.cc) (1 prop)
-
Camera.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Camera.h) (1 prop)
-
ControllableEntity.cc (modified) (1 diff)
-
ParticleSpawner.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/ParticleSpawner.cc) (1 prop)
-
ParticleSpawner.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/ParticleSpawner.h) (1 prop)
-
triggers (added)
-
triggers/DistanceTrigger.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.cc) (1 prop)
-
triggers/DistanceTrigger.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.h) (1 prop)
-
triggers/Trigger.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc) (1 prop)
-
triggers/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/Backlight.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/Backlight.cc merged eligible /code/branches/gui/src/orxonox/objects/Backlight.cc merged eligible /code/branches/core3/src/orxonox/objects/Backlight.cc 1572-1739 /code/branches/gcc43/src/orxonox/objects/Backlight.cc 1580 /code/branches/input/src/orxonox/objects/Backlight.cc 1629-1636 /code/branches/script_trigger/src/orxonox/objects/Backlight.cc 1295-1953,1955
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/Backlight.h merged eligible /code/branches/gui/src/orxonox/objects/Backlight.h merged eligible /code/branches/core3/src/orxonox/objects/Backlight.h 1572-1739 /code/branches/gcc43/src/orxonox/objects/Backlight.h 1580 /code/branches/input/src/orxonox/objects/Backlight.h 1629-1636 /code/branches/script_trigger/src/orxonox/objects/Backlight.h 1295-1953,1955
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/Camera.cc merged eligible /code/branches/core3/src/orxonox/objects/Camera.cc merged eligible /code/branches/gui/src/orxonox/objects/Camera.cc merged eligible /code/branches/script_trigger/src/orxonox/objects/Camera.cc merged eligible /code/branches/gcc43/src/orxonox/objects/Camera.cc 1580 /code/branches/input/src/orxonox/objects/Camera.cc 1629-1636
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/Camera.h merged eligible /code/branches/core3/src/orxonox/objects/Camera.h merged eligible /code/branches/gui/src/orxonox/objects/Camera.h merged eligible /code/branches/script_trigger/src/orxonox/objects/Camera.h merged eligible /code/branches/gcc43/src/orxonox/objects/Camera.h 1580 /code/branches/input/src/orxonox/objects/Camera.h 1629-1636
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc
r2019 r2027 36 36 37 37 #include "objects/infos/PlayerInfo.h" 38 #include "objects/ Camera.h"38 #include "objects/worldentities/Camera.h" 39 39 #include "overlays/OverlayGroup.h" 40 40 -
code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/ParticleSpawner.cc merged eligible /code/branches/core3/src/orxonox/objects/ParticleSpawner.cc merged eligible /code/branches/gui/src/orxonox/objects/ParticleSpawner.cc merged eligible /code/branches/gcc43/src/orxonox/objects/ParticleSpawner.cc 1580 /code/branches/input/src/orxonox/objects/ParticleSpawner.cc 1629-1636 /code/branches/script_trigger/src/orxonox/objects/ParticleSpawner.cc 1295-1953,1955
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/ParticleSpawner.h merged eligible /code/branches/core3/src/orxonox/objects/ParticleSpawner.h merged eligible /code/branches/gui/src/orxonox/objects/ParticleSpawner.h merged eligible /code/branches/gcc43/src/orxonox/objects/ParticleSpawner.h 1580 /code/branches/input/src/orxonox/objects/ParticleSpawner.h 1629-1636 /code/branches/script_trigger/src/orxonox/objects/ParticleSpawner.h 1295-1953,1955
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
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.
